@atlaskit/editor-plugin-block-controls 3.19.5 → 3.19.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.19.7
+
+### Patch Changes
+
+- [#174199](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/174199)
+  [`eee50ab6df3df`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eee50ab6df3df) -
+  Only create and find node decorations within the range provided
+- Updated dependencies
+
+## 3.19.6
+
+### Patch Changes
+
+- [#172583](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/172583)
+  [`40f387a0c0962`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/40f387a0c0962) -
+  Clean up platform_editor_controls_patch_2
+- Updated dependencies
+
 ## 3.19.5
 
 ### Patch Changes

package/dist/cjs/editor-commands/show-drag-handle.js

@@ -49,7 +49,7 @@ var findNextAnchorDecoration = function findNextAnchorDecoration(state) {
     return undefined;
   }
   var nextHandleNode = state.doc.nodeAt(nextHandleNodePos);
-  var nodeDecorations = nextHandleNode && (0, _decorationsAnchor.findNodeDecs)(decorations, nextHandleNodePos, nextHandleNodePos + nextHandleNode.nodeSize);
+  var nodeDecorations = nextHandleNode && (0, _decorationsAnchor.findNodeDecs)(state, decorations, nextHandleNodePos, nextHandleNodePos + nextHandleNode.nodeSize);
   if (!nodeDecorations || nodeDecorations.length === 0) {
     return undefined;
   }

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

@@ -48,46 +48,79 @@ var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, pare
   }
   return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) ? true : ignore_nodes.includes(node.type.name);
 };
+var getPositionBeforeNodeAtPos = function getPositionBeforeNodeAtPos(state, pos) {
+  if (pos <= 0 || pos >= state.doc.nodeSize - 2) {
+    return pos;
+  }
+  var $pos = state.doc.resolve(pos);
+  if ($pos.depth > 0) {
+    return $pos.before();
+  }
+  return pos;
+};
 
 /**
- * Find node decorations in the pos range between from and to (non-inclusive)
- * @param decorations
- * @param from
- * @param to
+ * Find node decorations corresponding to nodes with starting position between from and to (non-inclusive)
+ * @param from Position to start search from (inclusive)
+ * @param to Position to end search at (non-inclusive)
  * @returns
  */
-var findNodeDecs = exports.findNodeDecs = function findNodeDecs(decorations, from, to) {
-  var newfrom = from;
-  var newTo = to;
+var findNodeDecs = exports.findNodeDecs = function findNodeDecs(state, decorations, from, to) {
+  var newFrom = from;
+  if ((0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true)) {
+    // return empty array if range reversed
+    if (typeof to === 'number' && typeof newFrom === 'number' && newFrom > to) {
+      return [];
+    }
+    var decs = decorations.find(newFrom, to, function (spec) {
+      return spec.type === _decorationsCommon.TYPE_NODE_DEC;
+    });
 
-  // make it non-inclusive
-  if (newfrom !== undefined) {
-    newfrom++;
-  }
+    // Prosemirror finds any decorations that overlap with the provided position range, but we don't want to include decorations of nodes that start outside of the range
+    if (typeof to === 'number' && typeof newFrom === 'number') {
+      decs = decs.filter(function (dec) {
+        return dec.from >= (newFrom || 0) && dec.from < to;
+      });
+    }
+    return decs;
+  } else {
+    var newTo = to;
 
-  // make it non-inclusive
-  if (newTo !== undefined) {
-    newTo--;
-  }
+    // make it non-inclusive
+    if (newFrom !== undefined) {
+      newFrom++;
+    }
+
+    // make it non-inclusive
+    if (newTo !== undefined) {
+      newTo--;
+    }
 
-  // return empty array if range reversed
-  if (newfrom !== undefined && newTo !== undefined && newfrom > newTo) {
-    return [];
+    // return empty array if range reversed
+    if (newFrom !== undefined && newTo !== undefined && newFrom > newTo) {
+      return [];
+    }
+    return decorations.find(newFrom, newTo, function (spec) {
+      return spec.type === _decorationsCommon.TYPE_NODE_DEC;
+    });
   }
-  return decorations.find(newfrom, newTo, function (spec) {
-    return spec.type === _decorationsCommon.TYPE_NODE_DEC;
-  });
 };
 var nodeDecorations = exports.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 = (0, _experiments.editorExperiment)('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
-  newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, index) {
+  newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, _) {
     var depth = 0;
     var shouldDescend = shouldDescendIntoNode(node);
     var anchorName = (0, _decorationsCommon.getNodeAnchor)(node);
     var nodeTypeWithLevel = (0, _decorationsCommon.getNodeTypeWithLevel)(node);
+    if ((0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true)) {
+      // We don't want to create decorations for nodes that start outside of the provided position range
+      if (pos < getPositionBeforeNodeAtPos(newState, docFrom)) {
+        return shouldDescend;
+      }
+    }
 
     // Doesn't descend into a node
     if (node.isInline) {

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.handleMouseDown = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
   return function (view, event) {
     if (!(event.target instanceof HTMLElement)) {
@@ -20,7 +19,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
         return false;
       }
       api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, '', (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
-    } else if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_5')) {
+    } else {
       var isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle]') !== null;
       api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
     }

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

@@ -224,9 +224,9 @@ var getDecorations = exports.getDecorations = function getDecorations(state) {
   var _key$getState;
   return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
 };
-var getDecorationAtPos = function getDecorationAtPos(decorations, pos, to) {
+var getDecorationAtPos = function getDecorationAtPos(state, decorations, pos, to) {
   // Find the newly minted node decs that touch the active node
-  var findNewNodeDecs = (0, _decorationsAnchor.findNodeDecs)(decorations, pos - 1, to);
+  var findNewNodeDecs = (0, _decorationsAnchor.findNodeDecs)(state, decorations, (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? pos : pos - 1, to);
 
   // Find the specific dec that the active node corresponds to
   var nodeDecsAtActivePos = findNewNodeDecs.filter(function (dec) {
@@ -251,8 +251,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     menuTriggerBy = currentState.menuTriggerBy,
     isPMDragging = currentState.isPMDragging,
     isShiftDown = currentState.isShiftDown,
-    lastDragCancelled = currentState.lastDragCancelled,
-    isSelectedViaDragHandle = currentState.isSelectedViaDragHandle;
+    lastDragCancelled = currentState.lastDragCancelled;
   var isActiveNodeDeleted = false;
   var _getTrMetadata = (0, _transactions.getTrMetadata)(tr),
     from = _getTrMetadata.from,
@@ -335,14 +334,14 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   var shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging));
   var isActiveNodeModified = false;
   if (api && shouldRedrawNodeDecs) {
-    var oldNodeDecs = (0, _decorationsAnchor.findNodeDecs)(decorations, from, to);
+    var oldNodeDecs = (0, _decorationsAnchor.findNodeDecs)(newState, decorations, from, to);
     decorations = decorations.remove(oldNodeDecs);
     var newNodeDecs = (0, _decorationsAnchor.nodeDecorations)(newState, isDecSetEmpty ? undefined : from, isDecSetEmpty ? undefined : to);
     decorations = decorations.add(newState.doc, newNodeDecs);
     if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
       if (latestActiveNode && !isActiveNodeDeleted) {
         // Find the newly minted node decs that touch the active node
-        var findNewNodeDecs = (0, _decorationsAnchor.findNodeDecs)(decorations, latestActiveNode.pos - 1, to);
+        var findNewNodeDecs = (0, _decorationsAnchor.findNodeDecs)(newState, decorations, (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? latestActiveNode.pos : latestActiveNode.pos - 1, to);
 
         // Find the specific dec that the active node corresponds to
         var nodeDecsAtActivePos = findNewNodeDecs.filter(function (dec) {
@@ -361,8 +360,8 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
       }
     } else {
       if (latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
-        var _nodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.pos, to);
-        var rootNodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.rootPos, to);
+        var _nodeDecAtActivePos = getDecorationAtPos(newState, decorations, latestActiveNode.pos, to);
+        var rootNodeDecAtActivePos = getDecorationAtPos(newState, decorations, latestActiveNode.rootPos, to);
         if (_nodeDecAtActivePos || rootNodeDecAtActivePos) {
           isActiveNodeModified = true;
         }
@@ -401,7 +400,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
     shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   }
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7')) {
+  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
     // Remove handle dec when editor is blurred
     shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);
   }
@@ -468,7 +467,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   }
   var isEmptyDoc = (0, _utils.isEmptyDocument)(newState.doc);
   if (isEmptyDoc) {
-    var hasNodeDecoration = !!(0, _decorationsAnchor.findNodeDecs)(decorations).length;
+    var hasNodeDecoration = !!(0, _decorationsAnchor.findNodeDecs)(newState, decorations).length;
     if (!hasNodeDecoration) {
       decorations = decorations.add(newState.doc, [(0, _decorationsDragHandle.emptyParagraphNodeDecorations)()]);
     }
@@ -493,7 +492,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
     isMenuOpenNew = !isMenuOpen;
   }
-  var isSelectedViaDragHandleNew = (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle) !== undefined && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_5') ? meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle : isSelectedViaDragHandle;
+  var isSelectedViaDragHandle = (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle) !== undefined && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle);
   return {
     decorations: decorations,
     activeNode: newActiveNode,
@@ -510,7 +509,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     multiSelectDnD: multiSelectDnD,
     isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown,
     lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled,
-    isSelectedViaDragHandle: isSelectedViaDragHandleNew
+    isSelectedViaDragHandle: isSelectedViaDragHandle
   };
 };
 var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, nodeViewPortalProviderAPI) {
@@ -660,7 +659,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           (0, _handleMouseOver.handleMouseOver)(view, event, api);
           return false;
         },
-        mousedown: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2') ? (0, _handleMouseDown.handleMouseDown)(api) : undefined,
+        mousedown: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _handleMouseDown.handleMouseDown)(api) : undefined,
         keydown: function keydown(view, event) {
           if (isMultiSelectEnabled) {
             if (event.shiftKey && event.ctrlKey) {
@@ -684,11 +683,11 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
                 return true;
               }
             }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_5')) {
+            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
               var isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle="true"]') !== null;
               api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
             }
-            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_5')) {
+            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
               var _api$blockControls$sh2;
               if (api !== null && api !== void 0 && (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh2 !== void 0 && _api$blockControls$sh2.isSelectedViaDragHandle) {
                 api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
@@ -721,11 +720,11 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
                 return true;
               }
             }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_5')) {
+            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
               var _isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle="true"]') !== null;
               api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(_isDragHandle));
             }
-            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_5')) {
+            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
               var _api$blockControls$sh3;
               if (api !== null && api !== void 0 && (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh3 !== void 0 && _api$blockControls$sh3.isSelectedViaDragHandle) {
                 api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
@@ -741,7 +740,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           }
         },
         blur: function blur(view, event) {
-          if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7')) {
+          if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
             var _api$core2;
             var isChildOfEditor = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest("#".concat(_ui.EDIT_AREA_ID)) !== null;
 

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

@@ -609,7 +609,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     var node = parentPos !== undefined ? view.state.doc.nodeAt(parentPos) : undefined;
     var parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     var supportsAnchor = CSS.supports('top', "anchor(".concat(anchorName, " start)")) && CSS.supports('left', "anchor(".concat(anchorName, " start)"));
-    var safeAnchorName = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2') ? (0, _anchorName.refreshAnchorName)({
+    var safeAnchorName = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _anchorName.refreshAnchorName)({
       getPos: getPos,
       view: view,
       anchorName: anchorName
@@ -655,7 +655,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     var node = parentPos !== undefined ? view.state.doc.nodeAt(parentPos) : undefined;
     var parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     var supportsAnchor = CSS.supports('top', "anchor(".concat(anchorName, " start)")) && CSS.supports('left', "anchor(".concat(anchorName, " start)"));
-    var safeAnchorName = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2') ? (0, _anchorName.refreshAnchorName)({
+    var safeAnchorName = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _anchorName.refreshAnchorName)({
       getPos: getPos,
       view: view,
       anchorName: anchorName

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

@@ -129,11 +129,11 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
   // CHANGES - `removed editorExperiment('advanced_layouts', true) && isLayoutColumn` checks as quick insert button will not be positioned for layout column
   var calculatePosition = (0, _react.useCallback)(function () {
     var supportsAnchor = CSS.supports('top', "anchor(".concat(rootAnchorName, " start)")) && CSS.supports('left', "anchor(".concat(rootAnchorName, " start)"));
-    var safeAnchorName = (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2') ? (0, _anchorName.refreshAnchorName)({
+    var safeAnchorName = (0, _anchorName.refreshAnchorName)({
       getPos: getPos,
       view: view,
       anchorName: rootAnchorName
-    }) : rootAnchorName;
+    });
     var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(safeAnchorName, "\"]"));
     var hasResizer = rootNodeType === 'table' || rootNodeType === 'mediaSingle';
     var isExtension = rootNodeType === 'extension' || rootNodeType === 'bodiedExtension';

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

@@ -23,7 +23,7 @@ var refreshAnchorName = exports.refreshAnchorName = function refreshAnchorName(_
   var state = _main.key.getState(view.state);
   if (state !== null && state !== void 0 && state.decorations) {
     var _node$nodeSize;
-    var nodeDecs = (0, _decorationsAnchor.findNodeDecs)(state.decorations, pos, pos + ((_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 0));
+    var nodeDecs = (0, _decorationsAnchor.findNodeDecs)(view.state, state.decorations, pos, pos + ((_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 0));
     var nodeDec = nodeDecs.at(0);
     if (!nodeDec) {
       return newAnchorName;

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

@@ -48,7 +48,7 @@ const findNextAnchorDecoration = state => {
     return undefined;
   }
   const nextHandleNode = state.doc.nodeAt(nextHandleNodePos);
-  let nodeDecorations = nextHandleNode && findNodeDecs(decorations, nextHandleNodePos, nextHandleNodePos + nextHandleNode.nodeSize);
+  let nodeDecorations = nextHandleNode && findNodeDecs(state, decorations, nextHandleNodePos, nextHandleNodePos + nextHandleNode.nodeSize);
   if (!nodeDecorations || nodeDecorations.length === 0) {
     return undefined;
   }

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

@@ -40,44 +40,75 @@ const shouldIgnoreNode = (node, ignore_nodes, depth, parent) => {
   }
   return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) ? true : ignore_nodes.includes(node.type.name);
 };
+const getPositionBeforeNodeAtPos = (state, pos) => {
+  if (pos <= 0 || pos >= state.doc.nodeSize - 2) {
+    return pos;
+  }
+  const $pos = state.doc.resolve(pos);
+  if ($pos.depth > 0) {
+    return $pos.before();
+  }
+  return pos;
+};
 
 /**
- * Find node decorations in the pos range between from and to (non-inclusive)
- * @param decorations
- * @param from
- * @param to
+ * Find node decorations corresponding to nodes with starting position between from and to (non-inclusive)
+ * @param from Position to start search from (inclusive)
+ * @param to Position to end search at (non-inclusive)
  * @returns
  */
-export const findNodeDecs = (decorations, from, to) => {
-  let newfrom = from;
-  let newTo = to;
+export const findNodeDecs = (state, decorations, from, to) => {
+  let newFrom = from;
+  if (editorExperiment('platform_editor_block_control_optimise_render', true)) {
+    // return empty array if range reversed
+    if (typeof to === 'number' && typeof newFrom === 'number' && newFrom > to) {
+      return [];
+    }
+    let decs = decorations.find(newFrom, to, spec => spec.type === TYPE_NODE_DEC);
 
-  // make it non-inclusive
-  if (newfrom !== undefined) {
-    newfrom++;
-  }
+    // Prosemirror finds any decorations that overlap with the provided position range, but we don't want to include decorations of nodes that start outside of the range
+    if (typeof to === 'number' && typeof newFrom === 'number') {
+      decs = decs.filter(dec => {
+        return dec.from >= (newFrom || 0) && dec.from < to;
+      });
+    }
+    return decs;
+  } else {
+    let newTo = to;
 
-  // make it non-inclusive
-  if (newTo !== undefined) {
-    newTo--;
-  }
+    // make it non-inclusive
+    if (newFrom !== undefined) {
+      newFrom++;
+    }
+
+    // make it non-inclusive
+    if (newTo !== undefined) {
+      newTo--;
+    }
 
-  // return empty array if range reversed
-  if (newfrom !== undefined && newTo !== undefined && newfrom > newTo) {
-    return [];
+    // return empty array if range reversed
+    if (newFrom !== undefined && newTo !== undefined && newFrom > newTo) {
+      return [];
+    }
+    return decorations.find(newFrom, newTo, spec => spec.type === TYPE_NODE_DEC);
   }
-  return decorations.find(newfrom, newTo, spec => spec.type === TYPE_NODE_DEC);
 };
 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 = editorExperiment('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
-  newState.doc.nodesBetween(docFrom, docTo, (node, pos, parent, index) => {
+  newState.doc.nodesBetween(docFrom, docTo, (node, pos, parent, _) => {
     let depth = 0;
     const shouldDescend = shouldDescendIntoNode(node);
     const anchorName = getNodeAnchor(node);
     const nodeTypeWithLevel = getNodeTypeWithLevel(node);
+    if (editorExperiment('platform_editor_block_control_optimise_render', true)) {
+      // We don't want to create decorations for nodes that start outside of the provided position range
+      if (pos < getPositionBeforeNodeAtPos(newState, docFrom)) {
+        return shouldDescend;
+      }
+    }
 
     // Doesn't descend into a node
     if (node.isInline) {

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

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 export const handleMouseDown = api => (view, event) => {
   if (!(event.target instanceof HTMLElement)) {
     return false;
@@ -13,7 +12,7 @@ export const handleMouseDown = api => (view, event) => {
       return false;
     }
     api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, '', (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
-  } else if (fg('platform_editor_controls_patch_5')) {
+  } else {
     const isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle]') !== null;
     api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
   }

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

@@ -222,9 +222,9 @@ export const getDecorations = state => {
   var _key$getState;
   return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
 };
-const getDecorationAtPos = (decorations, pos, to) => {
+const getDecorationAtPos = (state, decorations, pos, to) => {
   // Find the newly minted node decs that touch the active node
-  const findNewNodeDecs = findNodeDecs(decorations, pos - 1, to);
+  const findNewNodeDecs = findNodeDecs(state, decorations, editorExperiment('platform_editor_block_control_optimise_render', true) ? pos : pos - 1, to);
 
   // Find the specific dec that the active node corresponds to
   const nodeDecsAtActivePos = findNewNodeDecs.filter(dec => (dec === null || dec === void 0 ? void 0 : dec.from) === pos);
@@ -250,8 +250,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     menuTriggerBy,
     isPMDragging,
     isShiftDown,
-    lastDragCancelled,
-    isSelectedViaDragHandle
+    lastDragCancelled
   } = currentState;
   let isActiveNodeDeleted = false;
   const {
@@ -336,14 +335,14 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
   const shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging));
   let isActiveNodeModified = false;
   if (api && shouldRedrawNodeDecs) {
-    const oldNodeDecs = findNodeDecs(decorations, from, to);
+    const oldNodeDecs = findNodeDecs(newState, decorations, from, to);
     decorations = decorations.remove(oldNodeDecs);
     const newNodeDecs = nodeDecorations(newState, isDecSetEmpty ? undefined : from, isDecSetEmpty ? undefined : to);
     decorations = decorations.add(newState.doc, newNodeDecs);
     if (editorExperiment('platform_editor_controls', 'control')) {
       if (latestActiveNode && !isActiveNodeDeleted) {
         // Find the newly minted node decs that touch the active node
-        const findNewNodeDecs = findNodeDecs(decorations, latestActiveNode.pos - 1, to);
+        const findNewNodeDecs = findNodeDecs(newState, decorations, editorExperiment('platform_editor_block_control_optimise_render', true) ? latestActiveNode.pos : latestActiveNode.pos - 1, to);
 
         // Find the specific dec that the active node corresponds to
         const nodeDecsAtActivePos = findNewNodeDecs.filter(dec => (dec === null || dec === void 0 ? void 0 : dec.from) === latestActiveNode.pos);
@@ -360,8 +359,8 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
       }
     } else {
       if (latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
-        const nodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.pos, to);
-        const rootNodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.rootPos, to);
+        const nodeDecAtActivePos = getDecorationAtPos(newState, decorations, latestActiveNode.pos, to);
+        const rootNodeDecAtActivePos = getDecorationAtPos(newState, decorations, latestActiveNode.rootPos, to);
         if (nodeDecAtActivePos || rootNodeDecAtActivePos) {
           isActiveNodeModified = true;
         }
@@ -400,7 +399,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
     shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   }
-  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+  if (editorExperiment('platform_editor_controls', 'variant1')) {
     // Remove handle dec when editor is blurred
     shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);
   }
@@ -468,7 +467,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
   }
   const isEmptyDoc = isEmptyDocument(newState.doc);
   if (isEmptyDoc) {
-    const hasNodeDecoration = !!findNodeDecs(decorations).length;
+    const hasNodeDecoration = !!findNodeDecs(newState, decorations).length;
     if (!hasNodeDecoration) {
       decorations = decorations.add(newState.doc, [emptyParagraphNodeDecorations()]);
     }
@@ -493,7 +492,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
   } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
     isMenuOpenNew = !isMenuOpen;
   }
-  const isSelectedViaDragHandleNew = (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle) !== undefined && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5') ? meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle : isSelectedViaDragHandle;
+  const isSelectedViaDragHandle = (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle) !== undefined && editorExperiment('platform_editor_controls', 'variant1') && (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle);
   return {
     decorations,
     activeNode: newActiveNode,
@@ -510,7 +509,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     multiSelectDnD,
     isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown,
     lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled,
-    isSelectedViaDragHandle: isSelectedViaDragHandleNew
+    isSelectedViaDragHandle
   };
 };
 export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
@@ -666,7 +665,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           handleMouseOver(view, event, api);
           return false;
         },
-        mousedown: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? handleMouseDown(api) : undefined,
+        mousedown: editorExperiment('platform_editor_controls', 'variant1') ? handleMouseDown(api) : undefined,
         keydown(view, event) {
           if (isMultiSelectEnabled) {
             if (event.shiftKey && event.ctrlKey) {
@@ -691,11 +690,11 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
                 return true;
               }
             }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5')) {
+            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1')) {
               const isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle="true"]') !== null;
               api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
             }
-            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5')) {
+            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1')) {
               var _api$blockControls$sh2;
               if (api !== null && api !== void 0 && (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh2 !== void 0 && _api$blockControls$sh2.isSelectedViaDragHandle) {
                 api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
@@ -730,11 +729,11 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
                 return true;
               }
             }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5')) {
+            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1')) {
               const isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle="true"]') !== null;
               api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
             }
-            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5')) {
+            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1')) {
               var _api$blockControls$sh3;
               if (api !== null && api !== void 0 && (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh3 !== void 0 && _api$blockControls$sh3.isSelectedViaDragHandle) {
                 api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
@@ -751,7 +750,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           }
         },
         blur(view, event) {
-          if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+          if (editorExperiment('platform_editor_controls', 'variant1')) {
             var _api$core2;
             const isChildOfEditor = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest(`#${EDIT_AREA_ID}`) !== null;
 

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

@@ -593,7 +593,7 @@ export const DragHandle = ({
     const node = parentPos !== undefined ? view.state.doc.nodeAt(parentPos) : undefined;
     const parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     const supportsAnchor = CSS.supports('top', `anchor(${anchorName} start)`) && CSS.supports('left', `anchor(${anchorName} start)`);
-    const safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? refreshAnchorName({
+    const safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') ? refreshAnchorName({
       getPos,
       view,
       anchorName
@@ -641,7 +641,7 @@ export const DragHandle = ({
     const node = parentPos !== undefined ? view.state.doc.nodeAt(parentPos) : undefined;
     const parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     const supportsAnchor = CSS.supports('top', `anchor(${anchorName} start)`) && CSS.supports('left', `anchor(${anchorName} start)`);
-    const safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? refreshAnchorName({
+    const safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') ? refreshAnchorName({
       getPos,
       view,
       anchorName

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

@@ -118,11 +118,11 @@ export const TypeAheadControl = ({
   // CHANGES - `removed editorExperiment('advanced_layouts', true) && isLayoutColumn` checks as quick insert button will not be positioned for layout column
   const calculatePosition = useCallback(() => {
     const supportsAnchor = CSS.supports('top', `anchor(${rootAnchorName} start)`) && CSS.supports('left', `anchor(${rootAnchorName} start)`);
-    const safeAnchorName = fg('platform_editor_controls_patch_2') ? refreshAnchorName({
+    const safeAnchorName = refreshAnchorName({
       getPos,
       view,
       anchorName: rootAnchorName
-    }) : rootAnchorName;
+    });
     const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${safeAnchorName}"]`);
     const hasResizer = rootNodeType === 'table' || rootNodeType === 'mediaSingle';
     const isExtension = rootNodeType === 'extension' || rootNodeType === 'bodiedExtension';

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

@@ -18,7 +18,7 @@ export const refreshAnchorName = ({
   const state = key.getState(view.state);
   if (state !== null && state !== void 0 && state.decorations) {
     var _node$nodeSize;
-    const nodeDecs = findNodeDecs(state.decorations, pos, pos + ((_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 0));
+    const nodeDecs = findNodeDecs(view.state, state.decorations, pos, pos + ((_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 0));
     const nodeDec = nodeDecs.at(0);
     if (!nodeDec) {
       return newAnchorName;

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

@@ -43,7 +43,7 @@ var findNextAnchorDecoration = function findNextAnchorDecoration(state) {
     return undefined;
   }
   var nextHandleNode = state.doc.nodeAt(nextHandleNodePos);
-  var nodeDecorations = nextHandleNode && findNodeDecs(decorations, nextHandleNodePos, nextHandleNodePos + nextHandleNode.nodeSize);
+  var nodeDecorations = nextHandleNode && findNodeDecs(state, decorations, nextHandleNodePos, nextHandleNodePos + nextHandleNode.nodeSize);
   if (!nodeDecorations || nodeDecorations.length === 0) {
     return undefined;
   }

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

@@ -41,46 +41,79 @@ var shouldIgnoreNode = function shouldIgnoreNode(node, ignore_nodes, depth, pare
   }
   return (isEmbedCard || isMediaSingle) && ['wrap-right', 'wrap-left'].includes(node.attrs.layout) ? true : ignore_nodes.includes(node.type.name);
 };
+var getPositionBeforeNodeAtPos = function getPositionBeforeNodeAtPos(state, pos) {
+  if (pos <= 0 || pos >= state.doc.nodeSize - 2) {
+    return pos;
+  }
+  var $pos = state.doc.resolve(pos);
+  if ($pos.depth > 0) {
+    return $pos.before();
+  }
+  return pos;
+};
 
 /**
- * Find node decorations in the pos range between from and to (non-inclusive)
- * @param decorations
- * @param from
- * @param to
+ * Find node decorations corresponding to nodes with starting position between from and to (non-inclusive)
+ * @param from Position to start search from (inclusive)
+ * @param to Position to end search at (non-inclusive)
  * @returns
  */
-export var findNodeDecs = function findNodeDecs(decorations, from, to) {
-  var newfrom = from;
-  var newTo = to;
+export var findNodeDecs = function findNodeDecs(state, decorations, from, to) {
+  var newFrom = from;
+  if (editorExperiment('platform_editor_block_control_optimise_render', true)) {
+    // return empty array if range reversed
+    if (typeof to === 'number' && typeof newFrom === 'number' && newFrom > to) {
+      return [];
+    }
+    var decs = decorations.find(newFrom, to, function (spec) {
+      return spec.type === TYPE_NODE_DEC;
+    });
 
-  // make it non-inclusive
-  if (newfrom !== undefined) {
-    newfrom++;
-  }
+    // Prosemirror finds any decorations that overlap with the provided position range, but we don't want to include decorations of nodes that start outside of the range
+    if (typeof to === 'number' && typeof newFrom === 'number') {
+      decs = decs.filter(function (dec) {
+        return dec.from >= (newFrom || 0) && dec.from < to;
+      });
+    }
+    return decs;
+  } else {
+    var newTo = to;
 
-  // make it non-inclusive
-  if (newTo !== undefined) {
-    newTo--;
-  }
+    // make it non-inclusive
+    if (newFrom !== undefined) {
+      newFrom++;
+    }
+
+    // make it non-inclusive
+    if (newTo !== undefined) {
+      newTo--;
+    }
 
-  // return empty array if range reversed
-  if (newfrom !== undefined && newTo !== undefined && newfrom > newTo) {
-    return [];
+    // return empty array if range reversed
+    if (newFrom !== undefined && newTo !== undefined && newFrom > newTo) {
+      return [];
+    }
+    return decorations.find(newFrom, newTo, function (spec) {
+      return spec.type === TYPE_NODE_DEC;
+    });
   }
-  return decorations.find(newfrom, newTo, function (spec) {
-    return spec.type === TYPE_NODE_DEC;
-  });
 };
 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 = editorExperiment('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
-  newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, index) {
+  newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, _) {
     var depth = 0;
     var shouldDescend = shouldDescendIntoNode(node);
     var anchorName = getNodeAnchor(node);
     var nodeTypeWithLevel = getNodeTypeWithLevel(node);
+    if (editorExperiment('platform_editor_block_control_optimise_render', true)) {
+      // We don't want to create decorations for nodes that start outside of the provided position range
+      if (pos < getPositionBeforeNodeAtPos(newState, docFrom)) {
+        return shouldDescend;
+      }
+    }
 
     // Doesn't descend into a node
     if (node.isInline) {

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

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 export var handleMouseDown = function handleMouseDown(api) {
   return function (view, event) {
     if (!(event.target instanceof HTMLElement)) {
@@ -14,7 +13,7 @@ export var handleMouseDown = function handleMouseDown(api) {
         return false;
       }
       api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name = rootNode.type.name) !== null && _rootNode$type$name !== void 0 ? _rootNode$type$name : '', undefined, rootPos, '', (_rootNode$type$name2 = rootNode.type.name) !== null && _rootNode$type$name2 !== void 0 ? _rootNode$type$name2 : ''));
-    } else if (fg('platform_editor_controls_patch_5')) {
+    } else {
       var isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle]') !== null;
       api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
     }

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

@@ -217,9 +217,9 @@ export var getDecorations = function getDecorations(state) {
   var _key$getState;
   return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
 };
-var getDecorationAtPos = function getDecorationAtPos(decorations, pos, to) {
+var getDecorationAtPos = function getDecorationAtPos(state, decorations, pos, to) {
   // Find the newly minted node decs that touch the active node
-  var findNewNodeDecs = findNodeDecs(decorations, pos - 1, to);
+  var findNewNodeDecs = findNodeDecs(state, decorations, editorExperiment('platform_editor_block_control_optimise_render', true) ? pos : pos - 1, to);
 
   // Find the specific dec that the active node corresponds to
   var nodeDecsAtActivePos = findNewNodeDecs.filter(function (dec) {
@@ -244,8 +244,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     menuTriggerBy = currentState.menuTriggerBy,
     isPMDragging = currentState.isPMDragging,
     isShiftDown = currentState.isShiftDown,
-    lastDragCancelled = currentState.lastDragCancelled,
-    isSelectedViaDragHandle = currentState.isSelectedViaDragHandle;
+    lastDragCancelled = currentState.lastDragCancelled;
   var isActiveNodeDeleted = false;
   var _getTrMetadata = getTrMetadata(tr),
     from = _getTrMetadata.from,
@@ -328,14 +327,14 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   var shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging));
   var isActiveNodeModified = false;
   if (api && shouldRedrawNodeDecs) {
-    var oldNodeDecs = findNodeDecs(decorations, from, to);
+    var oldNodeDecs = findNodeDecs(newState, decorations, from, to);
     decorations = decorations.remove(oldNodeDecs);
     var newNodeDecs = nodeDecorations(newState, isDecSetEmpty ? undefined : from, isDecSetEmpty ? undefined : to);
     decorations = decorations.add(newState.doc, newNodeDecs);
     if (editorExperiment('platform_editor_controls', 'control')) {
       if (latestActiveNode && !isActiveNodeDeleted) {
         // Find the newly minted node decs that touch the active node
-        var findNewNodeDecs = findNodeDecs(decorations, latestActiveNode.pos - 1, to);
+        var findNewNodeDecs = findNodeDecs(newState, decorations, editorExperiment('platform_editor_block_control_optimise_render', true) ? latestActiveNode.pos : latestActiveNode.pos - 1, to);
 
         // Find the specific dec that the active node corresponds to
         var nodeDecsAtActivePos = findNewNodeDecs.filter(function (dec) {
@@ -354,8 +353,8 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
       }
     } else {
       if (latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
-        var _nodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.pos, to);
-        var rootNodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.rootPos, to);
+        var _nodeDecAtActivePos = getDecorationAtPos(newState, decorations, latestActiveNode.pos, to);
+        var rootNodeDecAtActivePos = getDecorationAtPos(newState, decorations, latestActiveNode.rootPos, to);
         if (_nodeDecAtActivePos || rootNodeDecAtActivePos) {
           isActiveNodeModified = true;
         }
@@ -394,7 +393,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
     shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   }
-  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+  if (editorExperiment('platform_editor_controls', 'variant1')) {
     // Remove handle dec when editor is blurred
     shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);
   }
@@ -461,7 +460,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   }
   var isEmptyDoc = isEmptyDocument(newState.doc);
   if (isEmptyDoc) {
-    var hasNodeDecoration = !!findNodeDecs(decorations).length;
+    var hasNodeDecoration = !!findNodeDecs(newState, decorations).length;
     if (!hasNodeDecoration) {
       decorations = decorations.add(newState.doc, [emptyParagraphNodeDecorations()]);
     }
@@ -486,7 +485,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
     isMenuOpenNew = !isMenuOpen;
   }
-  var isSelectedViaDragHandleNew = (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle) !== undefined && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5') ? meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle : isSelectedViaDragHandle;
+  var isSelectedViaDragHandle = (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle) !== undefined && editorExperiment('platform_editor_controls', 'variant1') && (meta === null || meta === void 0 ? void 0 : meta.isSelectedViaDragHandle);
   return {
     decorations: decorations,
     activeNode: newActiveNode,
@@ -503,7 +502,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     multiSelectDnD: multiSelectDnD,
     isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown,
     lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled,
-    isSelectedViaDragHandle: isSelectedViaDragHandleNew
+    isSelectedViaDragHandle: isSelectedViaDragHandle
   };
 };
 export { _apply as apply };
@@ -654,7 +653,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           handleMouseOver(view, event, api);
           return false;
         },
-        mousedown: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? handleMouseDown(api) : undefined,
+        mousedown: editorExperiment('platform_editor_controls', 'variant1') ? handleMouseDown(api) : undefined,
         keydown: function keydown(view, event) {
           if (isMultiSelectEnabled) {
             if (event.shiftKey && event.ctrlKey) {
@@ -678,11 +677,11 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
                 return true;
               }
             }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5')) {
+            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1')) {
               var isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle="true"]') !== null;
               api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
             }
-            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5')) {
+            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1')) {
               var _api$blockControls$sh2;
               if (api !== null && api !== void 0 && (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh2 !== void 0 && _api$blockControls$sh2.isSelectedViaDragHandle) {
                 api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
@@ -715,11 +714,11 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
                 return true;
               }
             }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5')) {
+            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1')) {
               var _isDragHandle = event.target.closest('[data-editor-block-ctrl-drag-handle="true"]') !== null;
               api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(_isDragHandle));
             }
-            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_5')) {
+            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1')) {
               var _api$blockControls$sh3;
               if (api !== null && api !== void 0 && (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh3 !== void 0 && _api$blockControls$sh3.isSelectedViaDragHandle) {
                 api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
@@ -735,7 +734,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           }
         },
         blur: function blur(view, event) {
-          if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+          if (editorExperiment('platform_editor_controls', 'variant1')) {
             var _api$core2;
             var isChildOfEditor = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest("#".concat(EDIT_AREA_ID)) !== null;
 

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

@@ -606,7 +606,7 @@ export var DragHandle = function DragHandle(_ref) {
     var node = parentPos !== undefined ? view.state.doc.nodeAt(parentPos) : undefined;
     var parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     var supportsAnchor = CSS.supports('top', "anchor(".concat(anchorName, " start)")) && CSS.supports('left', "anchor(".concat(anchorName, " start)"));
-    var safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? refreshAnchorName({
+    var safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') ? refreshAnchorName({
       getPos: getPos,
       view: view,
       anchorName: anchorName
@@ -652,7 +652,7 @@ export var DragHandle = function DragHandle(_ref) {
     var node = parentPos !== undefined ? view.state.doc.nodeAt(parentPos) : undefined;
     var parentNodeType = node === null || node === void 0 ? void 0 : node.type.name;
     var supportsAnchor = CSS.supports('top', "anchor(".concat(anchorName, " start)")) && CSS.supports('left', "anchor(".concat(anchorName, " start)"));
-    var safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_2') ? refreshAnchorName({
+    var safeAnchorName = editorExperiment('platform_editor_controls', 'variant1') ? refreshAnchorName({
       getPos: getPos,
       view: view,
       anchorName: anchorName

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

@@ -124,11 +124,11 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
   // CHANGES - `removed editorExperiment('advanced_layouts', true) && isLayoutColumn` checks as quick insert button will not be positioned for layout column
   var calculatePosition = useCallback(function () {
     var supportsAnchor = CSS.supports('top', "anchor(".concat(rootAnchorName, " start)")) && CSS.supports('left', "anchor(".concat(rootAnchorName, " start)"));
-    var safeAnchorName = fg('platform_editor_controls_patch_2') ? refreshAnchorName({
+    var safeAnchorName = refreshAnchorName({
       getPos: getPos,
       view: view,
       anchorName: rootAnchorName
-    }) : rootAnchorName;
+    });
     var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(safeAnchorName, "\"]"));
     var hasResizer = rootNodeType === 'table' || rootNodeType === 'mediaSingle';
     var isExtension = rootNodeType === 'extension' || rootNodeType === 'bodiedExtension';

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

@@ -17,7 +17,7 @@ export var refreshAnchorName = function refreshAnchorName(_ref) {
   var state = key.getState(view.state);
   if (state !== null && state !== void 0 && state.decorations) {
     var _node$nodeSize;
-    var nodeDecs = findNodeDecs(state.decorations, pos, pos + ((_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 0));
+    var nodeDecs = findNodeDecs(view.state, state.decorations, pos, pos + ((_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 0));
     var nodeDec = nodeDecs.at(0);
     if (!nodeDec) {
       return newAnchorName;

package/dist/types/pm-plugins/decorations-anchor.d.ts

@@ -3,11 +3,10 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { Decoration, type DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export declare const shouldDescendIntoNode: (node: PMNode) => boolean;
 /**
- * Find node decorations in the pos range between from and to (non-inclusive)
- * @param decorations
- * @param from
- * @param to
+ * Find node decorations corresponding to nodes with starting position between from and to (non-inclusive)
+ * @param from Position to start search from (inclusive)
+ * @param to Position to end search at (non-inclusive)
  * @returns
  */
-export declare const findNodeDecs: (decorations: DecorationSet, from?: number, to?: number) => Decoration[];
+export declare const findNodeDecs: (state: EditorState, decorations: DecorationSet, from?: number, to?: number) => Decoration[];
 export declare const nodeDecorations: (newState: EditorState, from?: number, to?: number) => Decoration[];

package/dist/types-ts4.5/pm-plugins/decorations-anchor.d.ts

@@ -3,11 +3,10 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { Decoration, type DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export declare const shouldDescendIntoNode: (node: PMNode) => boolean;
 /**
- * Find node decorations in the pos range between from and to (non-inclusive)
- * @param decorations
- * @param from
- * @param to
+ * Find node decorations corresponding to nodes with starting position between from and to (non-inclusive)
+ * @param from Position to start search from (inclusive)
+ * @param to Position to end search at (non-inclusive)
  * @returns
  */
-export declare const findNodeDecs: (decorations: DecorationSet, from?: number, to?: number) => Decoration[];
+export declare const findNodeDecs: (state: EditorState, decorations: DecorationSet, from?: number, to?: number) => Decoration[];
 export declare const nodeDecorations: (newState: EditorState, from?: number, to?: number) => Decoration[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.19.5",
+	"version": "3.19.7",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -54,10 +54,10 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
-		"@atlaskit/primitives": "^14.8.0",
+		"@atlaskit/primitives": "^14.9.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^7.1.0",
-		"@atlaskit/tokens": "^5.2.0",
+		"@atlaskit/tmp-editor-statsig": "^8.0.0",
+		"@atlaskit/tokens": "^5.3.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -156,21 +156,12 @@
 		"platform_editor_fix_safari_cursor_hidden_empty": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_2": {
-			"type": "boolean"
-		},
 		"platform_editor_controls_widget_visibility": {
 			"type": "boolean"
 		},
 		"platform_editor_controls_patch_4": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_5": {
-			"type": "boolean"
-		},
-		"platform_editor_controls_patch_7": {
-			"type": "boolean"
-		},
 		"platform_editor_no_cursor_on_live_doc_init": {
 			"type": "boolean"
 		},