@atlaskit/editor-plugin-block-controls 2.6.1 → 2.6.3

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.6.3
+
+### Patch Changes
+
+- [#153087](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/153087)
+  [`a29ea6551ed67`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a29ea6551ed67) -
+  ED-24902: Change display from inline to block to fix focus issues with drag handle
+- [#152414](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152414)
+  [`893c9f74cb700`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/893c9f74cb700) -
+  Use getPos instead of pos when rendering drag handle
+- Updated dependencies
+
+## 2.6.2
+
+### Patch Changes
+
+- [#152656](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152656)
+  [`07cd0baf1bb6f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/07cd0baf1bb6f) -
+  Fix corner case where getTrMetadata does not give full pos range
+
 ## 2.6.1
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -52,20 +52,9 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
           return tr;
         };
       },
-      hideDragHandle: function hideDragHandle() {
+      setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
         return function (_ref5) {
           var tr = _ref5.tr;
-          if ((0, _platformFeatureFlags.fg)('confluence_frontend_page_title_enter_improvements')) {
-            tr.setMeta(_main.key, {
-              hideDragHandle: true
-            });
-          }
-          return tr;
-        };
-      },
-      setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
-        return function (_ref6) {
-          var tr = _ref6.tr;
           var pos = getPos();
           if (pos === undefined) {
             return tr;

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

@@ -336,18 +336,22 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
   return _view.Decoration.widget(pos, function (view, getPos) {
     var element = document.createElement('span');
     // Need to set it to inline to avoid text being split when merging two paragraphs
-    element.style.display = 'inline';
+    // platform_editor_element_dnd_nested_fix_patch_2 -> inline decoration causes focus issues when refocusing Editor into first line
+    element.style.display = (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_2') ? 'block' : 'inline';
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');
     element.setAttribute('data-blocks-drag-handle-container', 'true');
     var isTopLevelNode = true;
     if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
-      var $pos = view.state.doc.resolve(pos);
-      isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+      var newPos = (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_3') ? getPos() : pos;
+      if (typeof newPos === 'number') {
+        var $pos = view.state.doc.resolve(newPos);
+        isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+      }
       /*
        * We disable mouseover event to fix flickering issue on hover
        * However, the tooltip for nested drag handle is no long working.
        */
-      if (!isTopLevelNode) {
+      if (newPos === undefined || !isTopLevelNode) {
         // This will also hide the tooltip.
         unbind = (0, _bindEventListener.bind)(element, {
           type: 'mouseover',

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

@@ -13,11 +13,6 @@ var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(t
   }
   return false;
 };
-var isDocFirstChildEmptyLine = function isDocFirstChildEmptyLine(elem) {
-  var _elem$firstElementChi;
-  var parentElement = elem.parentElement;
-  return (parentElement === null || parentElement === void 0 ? void 0 : parentElement.classList.contains('ProseMirror')) && (parentElement === null || parentElement === void 0 ? void 0 : parentElement.firstElementChild) === elem && ['P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6'].includes(elem.nodeName) && elem.childNodes.length === 1 && ((_elem$firstElementChi = elem.firstElementChild) === null || _elem$firstElementChi === void 0 ? void 0 : _elem$firstElementChi.classList.contains('ProseMirror-trailingBreak'));
-};
 var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -36,11 +31,6 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
   var rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');
   if (rootElement) {
     var _rootElement$parentEl;
-    if (isDocFirstChildEmptyLine(rootElement) && (0, _platformFeatureFlags.fg)('confluence_frontend_page_title_enter_improvements')) {
-      var _api$core, _api$blockControls2;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.hideDragHandle());
-      return;
-    }
     // We want to exlude handles from showing for empty paragraph and heading nodes
     if ((0, _experiments.editorExperiment)('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
@@ -89,8 +79,8 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     }
     var nodeType = rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
-      var _api$core2, _api$blockControls3;
-      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(rootPos, anchorName, nodeType));
+      var _api$core, _api$blockControls2;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(rootPos, anchorName, nodeType));
     }
   }
 };

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

@@ -97,7 +97,6 @@ var initialState = {
 };
 var newApply = exports.newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, anchorHeightsCache) {
   var _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging;
-  var isTitleEnterImprovementEnabled = flags.isTitleEnterImprovementEnabled;
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
     editorHeight = currentState.editorHeight,
@@ -177,7 +176,7 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
   var shouldRecreateHandle = latestActiveNode && (activeNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
 
   // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
-  var shouldRemoveHandle = latestActiveNode && ((meta === null || meta === void 0 ? void 0 : meta.hideDragHandle) && isTitleEnterImprovementEnabled || isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
+  var shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   if (shouldRemoveHandle) {
     var _activeNode3, _activeNode4;
     var oldHandle = (0, _decorations.findHandleDec)(decorations, (_activeNode3 = activeNode) === null || _activeNode3 === void 0 ? void 0 : _activeNode3.pos, (_activeNode4 = activeNode) === null || _activeNode4 === void 0 ? void 0 : _activeNode4.pos);
@@ -229,8 +228,7 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
 };
 var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, currentState, oldState, newState, flags, anchorHeightsCache) {
   var _meta$activeNode2, _meta$activeNode$hand2, _activeNodeWithNewNod, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
-  var isNestedEnabled = flags.isNestedEnabled,
-    isTitleEnterImprovementEnabled = flags.isTitleEnterImprovementEnabled;
+  var isNestedEnabled = flags.isNestedEnabled;
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
     isMenuOpen = currentState.isMenuOpen,
@@ -265,7 +263,7 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
   // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
   // Also remove the handle when the node is moved or the node count changes. This helps prevent incorrect positioning
   // Don't remove the handle if remote changes are changing the node count, its prosemirror position can be mapped instead
-  if (meta !== null && meta !== void 0 && meta.hideDragHandle && isTitleEnterImprovementEnabled || isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
+  if (isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
     var oldHandle = decorations.find(undefined, undefined, function (spec) {
       return spec.type === 'drag-handle';
     });
@@ -429,11 +427,9 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
   var isOptimisedApply = isNestedEnabled && (0, _experiments.editorExperiment)('optimised-apply-dnd', true, {
     exposure: true
   });
-  var isTitleEnterImprovementEnabled = (0, _platformFeatureFlags.fg)('confluence_frontend_page_title_enter_improvements');
   var flags = {
     isNestedEnabled: isNestedEnabled,
-    isOptimisedApply: isOptimisedApply,
-    isTitleEnterImprovementEnabled: isTitleEnterImprovementEnabled
+    isOptimisedApply: isOptimisedApply
   };
   if ((0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_2')) {
     // TODO: Remove this once FG is used in code

package/dist/cjs/utils/transactions.js

@@ -28,7 +28,7 @@ var isStepDelete = exports.isStepDelete = function isStepDelete(s) {
 /**
  * Get metadata from the transaction.
  * @param tr
- * @returns Min 'from', max 'to' (from + slice size). If no steps, returns pos range of entire doc.
+ * @returns Min 'from', max 'to' (from + slice size, or mapped 'to', whichever is larger). If no steps, returns pos range of entire doc.
  * Number of ReplaceStep and ReplaceAroundStep steps 'numReplaceSteps'.
  * 'isAllText' if all steps are represent adding inline text or a backspace/delete or no-op
  */
@@ -42,7 +42,9 @@ var getTrMetadata = exports.getTrMetadata = function getTrMetadata(tr) {
       if (s instanceof _transform.ReplaceAroundStep || s instanceof _transform.ReplaceStep && !isStepText(s) && !isStepDelete(s)) {
         isAllText = false;
       }
+      var mappedTo = tr.mapping.map(s.to);
       var $to = s.from + s.slice.size;
+      $to = $to > mappedTo ? $to : mappedTo;
       from = from === undefined || from > s.from ? s.from : from;
       to = to === undefined || to < $to ? $to : to;
       numReplaceSteps++;

package/dist/es2019/plugin.js

@@ -41,16 +41,6 @@ export const blockControlsPlugin = ({
       });
       return tr;
     },
-    hideDragHandle: () => ({
-      tr
-    }) => {
-      if (fg('confluence_frontend_page_title_enter_improvements')) {
-        tr.setMeta(key, {
-          hideDragHandle: true
-        });
-      }
-      return tr;
-    },
     setNodeDragged: (getPos, anchorName, nodeType) => ({
       tr
     }) => {

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

@@ -316,18 +316,22 @@ export const dragHandleDecoration = (api, formatMessage, pos, anchorName, nodeTy
   return Decoration.widget(pos, (view, getPos) => {
     const element = document.createElement('span');
     // Need to set it to inline to avoid text being split when merging two paragraphs
-    element.style.display = 'inline';
+    // platform_editor_element_dnd_nested_fix_patch_2 -> inline decoration causes focus issues when refocusing Editor into first line
+    element.style.display = fg('platform_editor_element_dnd_nested_fix_patch_2') ? 'block' : 'inline';
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');
     element.setAttribute('data-blocks-drag-handle-container', 'true');
     let isTopLevelNode = true;
     if (editorExperiment('nested-dnd', true)) {
-      const $pos = view.state.doc.resolve(pos);
-      isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+      const newPos = fg('platform_editor_element_dnd_nested_fix_patch_3') ? getPos() : pos;
+      if (typeof newPos === 'number') {
+        const $pos = view.state.doc.resolve(newPos);
+        isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+      }
       /*
        * We disable mouseover event to fix flickering issue on hover
        * However, the tooltip for nested drag handle is no long working.
        */
-      if (!isTopLevelNode) {
+      if (newPos === undefined || !isTopLevelNode) {
         // This will also hide the tooltip.
         unbind = bind(element, {
           type: 'mouseover',

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

@@ -7,11 +7,6 @@ const isEmptyNestedParagraphOrHeading = target => {
   }
   return false;
 };
-const isDocFirstChildEmptyLine = elem => {
-  var _elem$firstElementChi;
-  const parentElement = elem.parentElement;
-  return (parentElement === null || parentElement === void 0 ? void 0 : parentElement.classList.contains('ProseMirror')) && (parentElement === null || parentElement === void 0 ? void 0 : parentElement.firstElementChild) === elem && ['P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6'].includes(elem.nodeName) && elem.childNodes.length === 1 && ((_elem$firstElementChi = elem.firstElementChild) === null || _elem$firstElementChi === void 0 ? void 0 : _elem$firstElementChi.classList.contains('ProseMirror-trailingBreak'));
-};
 export const handleMouseOver = (view, event, api) => {
   var _api$blockControls, _target$classList;
   const {
@@ -31,11 +26,6 @@ export const handleMouseOver = (view, event, api) => {
   let rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');
   if (rootElement) {
     var _rootElement$parentEl;
-    if (isDocFirstChildEmptyLine(rootElement) && fg('confluence_frontend_page_title_enter_improvements')) {
-      var _api$core, _api$blockControls2;
-      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.hideDragHandle());
-      return;
-    }
     // We want to exlude handles from showing for empty paragraph and heading nodes
     if (editorExperiment('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
@@ -84,8 +74,8 @@ export const handleMouseOver = (view, event, api) => {
     }
     const nodeType = rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
-      var _api$core2, _api$blockControls3;
-      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(rootPos, anchorName, nodeType));
+      var _api$core, _api$blockControls2;
+      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(rootPos, anchorName, nodeType));
     }
   }
 };

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

@@ -91,9 +91,6 @@ const initialState = {
 };
 export const newApply = (api, formatMessage, tr, currentState, newState, flags, anchorHeightsCache) => {
   var _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging;
-  const {
-    isTitleEnterImprovementEnabled
-  } = flags;
   let {
     activeNode,
     decorations,
@@ -176,7 +173,7 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
   const shouldRecreateHandle = latestActiveNode && (activeNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
 
   // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
-  const shouldRemoveHandle = latestActiveNode && ((meta === null || meta === void 0 ? void 0 : meta.hideDragHandle) && isTitleEnterImprovementEnabled || isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
+  const shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   if (shouldRemoveHandle) {
     var _activeNode3, _activeNode4;
     const oldHandle = findHandleDec(decorations, (_activeNode3 = activeNode) === null || _activeNode3 === void 0 ? void 0 : _activeNode3.pos, (_activeNode4 = activeNode) === null || _activeNode4 === void 0 ? void 0 : _activeNode4.pos);
@@ -229,8 +226,7 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
 export const oldApply = (api, formatMessage, tr, currentState, oldState, newState, flags, anchorHeightsCache) => {
   var _meta$activeNode2, _meta$activeNode$hand2, _activeNodeWithNewNod, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
   const {
-    isNestedEnabled,
-    isTitleEnterImprovementEnabled
+    isNestedEnabled
   } = flags;
   let {
     activeNode,
@@ -264,7 +260,7 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
   // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
   // Also remove the handle when the node is moved or the node count changes. This helps prevent incorrect positioning
   // Don't remove the handle if remote changes are changing the node count, its prosemirror position can be mapped instead
-  if (meta !== null && meta !== void 0 && meta.hideDragHandle && isTitleEnterImprovementEnabled || isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
+  if (isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
     const oldHandle = decorations.find(undefined, undefined, spec => spec.type === 'drag-handle');
     decorations = decorations.remove(oldHandle);
   }
@@ -406,11 +402,9 @@ export const createPlugin = (api, getIntl) => {
   const isOptimisedApply = isNestedEnabled && editorExperiment('optimised-apply-dnd', true, {
     exposure: true
   });
-  const isTitleEnterImprovementEnabled = fg('confluence_frontend_page_title_enter_improvements');
   const flags = {
     isNestedEnabled,
-    isOptimisedApply,
-    isTitleEnterImprovementEnabled
+    isOptimisedApply
   };
   if (fg('platform_editor_element_dnd_nested_fix_patch_2')) {
     // TODO: Remove this once FG is used in code

package/dist/es2019/utils/transactions.js

@@ -22,7 +22,7 @@ export const isStepDelete = s => {
 /**
  * Get metadata from the transaction.
  * @param tr
- * @returns Min 'from', max 'to' (from + slice size). If no steps, returns pos range of entire doc.
+ * @returns Min 'from', max 'to' (from + slice size, or mapped 'to', whichever is larger). If no steps, returns pos range of entire doc.
  * Number of ReplaceStep and ReplaceAroundStep steps 'numReplaceSteps'.
  * 'isAllText' if all steps are represent adding inline text or a backspace/delete or no-op
  */
@@ -36,7 +36,9 @@ export const getTrMetadata = tr => {
       if (s instanceof ReplaceAroundStep || s instanceof ReplaceStep && !isStepText(s) && !isStepDelete(s)) {
         isAllText = false;
       }
-      const $to = s.from + s.slice.size;
+      const mappedTo = tr.mapping.map(s.to);
+      let $to = s.from + s.slice.size;
+      $to = $to > mappedTo ? $to : mappedTo;
       from = from === undefined || from > s.from ? s.from : from;
       to = to === undefined || to < $to ? $to : to;
       numReplaceSteps++;

package/dist/esm/plugin.js

@@ -45,20 +45,9 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
           return tr;
         };
       },
-      hideDragHandle: function hideDragHandle() {
+      setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
         return function (_ref5) {
           var tr = _ref5.tr;
-          if (fg('confluence_frontend_page_title_enter_improvements')) {
-            tr.setMeta(key, {
-              hideDragHandle: true
-            });
-          }
-          return tr;
-        };
-      },
-      setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
-        return function (_ref6) {
-          var tr = _ref6.tr;
           var pos = getPos();
           if (pos === undefined) {
             return tr;

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

@@ -329,18 +329,22 @@ export var dragHandleDecoration = function dragHandleDecoration(api, formatMessa
   return Decoration.widget(pos, function (view, getPos) {
     var element = document.createElement('span');
     // Need to set it to inline to avoid text being split when merging two paragraphs
-    element.style.display = 'inline';
+    // platform_editor_element_dnd_nested_fix_patch_2 -> inline decoration causes focus issues when refocusing Editor into first line
+    element.style.display = fg('platform_editor_element_dnd_nested_fix_patch_2') ? 'block' : 'inline';
     element.setAttribute('data-testid', 'block-ctrl-decorator-widget');
     element.setAttribute('data-blocks-drag-handle-container', 'true');
     var isTopLevelNode = true;
     if (editorExperiment('nested-dnd', true)) {
-      var $pos = view.state.doc.resolve(pos);
-      isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+      var newPos = fg('platform_editor_element_dnd_nested_fix_patch_3') ? getPos() : pos;
+      if (typeof newPos === 'number') {
+        var $pos = view.state.doc.resolve(newPos);
+        isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+      }
       /*
        * We disable mouseover event to fix flickering issue on hover
        * However, the tooltip for nested drag handle is no long working.
        */
-      if (!isTopLevelNode) {
+      if (newPos === undefined || !isTopLevelNode) {
         // This will also hide the tooltip.
         unbind = bind(element, {
           type: 'mouseover',

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

@@ -7,11 +7,6 @@ var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(t
   }
   return false;
 };
-var isDocFirstChildEmptyLine = function isDocFirstChildEmptyLine(elem) {
-  var _elem$firstElementChi;
-  var parentElement = elem.parentElement;
-  return (parentElement === null || parentElement === void 0 ? void 0 : parentElement.classList.contains('ProseMirror')) && (parentElement === null || parentElement === void 0 ? void 0 : parentElement.firstElementChild) === elem && ['P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6'].includes(elem.nodeName) && elem.childNodes.length === 1 && ((_elem$firstElementChi = elem.firstElementChild) === null || _elem$firstElementChi === void 0 ? void 0 : _elem$firstElementChi.classList.contains('ProseMirror-trailingBreak'));
-};
 export var handleMouseOver = function handleMouseOver(view, event, api) {
   var _api$blockControls, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -30,11 +25,6 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
   var rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');
   if (rootElement) {
     var _rootElement$parentEl;
-    if (isDocFirstChildEmptyLine(rootElement) && fg('confluence_frontend_page_title_enter_improvements')) {
-      var _api$core, _api$blockControls2;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.hideDragHandle());
-      return;
-    }
     // We want to exlude handles from showing for empty paragraph and heading nodes
     if (editorExperiment('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
@@ -83,8 +73,8 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     }
     var nodeType = rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
-      var _api$core2, _api$blockControls3;
-      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(rootPos, anchorName, nodeType));
+      var _api$core, _api$blockControls2;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(rootPos, anchorName, nodeType));
     }
   }
 };

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

@@ -90,7 +90,6 @@ var initialState = {
 };
 export var newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, anchorHeightsCache) {
   var _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging;
-  var isTitleEnterImprovementEnabled = flags.isTitleEnterImprovementEnabled;
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
     editorHeight = currentState.editorHeight,
@@ -170,7 +169,7 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
   var shouldRecreateHandle = latestActiveNode && (activeNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
 
   // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
-  var shouldRemoveHandle = latestActiveNode && ((meta === null || meta === void 0 ? void 0 : meta.hideDragHandle) && isTitleEnterImprovementEnabled || isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
+  var shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
   if (shouldRemoveHandle) {
     var _activeNode3, _activeNode4;
     var oldHandle = findHandleDec(decorations, (_activeNode3 = activeNode) === null || _activeNode3 === void 0 ? void 0 : _activeNode3.pos, (_activeNode4 = activeNode) === null || _activeNode4 === void 0 ? void 0 : _activeNode4.pos);
@@ -222,8 +221,7 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
 };
 export var oldApply = function oldApply(api, formatMessage, tr, currentState, oldState, newState, flags, anchorHeightsCache) {
   var _meta$activeNode2, _meta$activeNode$hand2, _activeNodeWithNewNod, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
-  var isNestedEnabled = flags.isNestedEnabled,
-    isTitleEnterImprovementEnabled = flags.isTitleEnterImprovementEnabled;
+  var isNestedEnabled = flags.isNestedEnabled;
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
     isMenuOpen = currentState.isMenuOpen,
@@ -258,7 +256,7 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
   // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
   // Also remove the handle when the node is moved or the node count changes. This helps prevent incorrect positioning
   // Don't remove the handle if remote changes are changing the node count, its prosemirror position can be mapped instead
-  if (meta !== null && meta !== void 0 && meta.hideDragHandle && isTitleEnterImprovementEnabled || isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
+  if (isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
     var oldHandle = decorations.find(undefined, undefined, function (spec) {
       return spec.type === 'drag-handle';
     });
@@ -422,11 +420,9 @@ export var createPlugin = function createPlugin(api, getIntl) {
   var isOptimisedApply = isNestedEnabled && editorExperiment('optimised-apply-dnd', true, {
     exposure: true
   });
-  var isTitleEnterImprovementEnabled = fg('confluence_frontend_page_title_enter_improvements');
   var flags = {
     isNestedEnabled: isNestedEnabled,
-    isOptimisedApply: isOptimisedApply,
-    isTitleEnterImprovementEnabled: isTitleEnterImprovementEnabled
+    isOptimisedApply: isOptimisedApply
   };
   if (fg('platform_editor_element_dnd_nested_fix_patch_2')) {
     // TODO: Remove this once FG is used in code

package/dist/esm/utils/transactions.js

@@ -22,7 +22,7 @@ export var isStepDelete = function isStepDelete(s) {
 /**
  * Get metadata from the transaction.
  * @param tr
- * @returns Min 'from', max 'to' (from + slice size). If no steps, returns pos range of entire doc.
+ * @returns Min 'from', max 'to' (from + slice size, or mapped 'to', whichever is larger). If no steps, returns pos range of entire doc.
  * Number of ReplaceStep and ReplaceAroundStep steps 'numReplaceSteps'.
  * 'isAllText' if all steps are represent adding inline text or a backspace/delete or no-op
  */
@@ -36,7 +36,9 @@ export var getTrMetadata = function getTrMetadata(tr) {
       if (s instanceof ReplaceAroundStep || s instanceof ReplaceStep && !isStepText(s) && !isStepDelete(s)) {
         isAllText = false;
       }
+      var mappedTo = tr.mapping.map(s.to);
       var $to = s.from + s.slice.size;
+      $to = $to > mappedTo ? $to : mappedTo;
       from = from === undefined || from > s.from ? s.from : from;
       to = to === undefined || to < $to ? $to : to;
       numReplaceSteps++;

package/dist/types/pm-plugins/main.d.ts

@@ -10,7 +10,6 @@ export declare const key: PluginKey<PluginState>;
 export interface FlagType {
     isNestedEnabled: boolean;
     isOptimisedApply: boolean;
-    isTitleEnterImprovementEnabled: boolean;
 }
 export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, anchorHeightsCache?: AnchorHeightsCache) => {
     decorations: DecorationSet;

package/dist/types/types.d.ts

@@ -60,7 +60,6 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     commands: {
         moveNode: (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;
-        hideDragHandle: () => EditorCommand;
         setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
     };
 }>;

package/dist/types/utils/transactions.d.ts

@@ -21,7 +21,7 @@ export declare const isStepDelete: (s: ReplaceStep) => boolean;
 /**
  * Get metadata from the transaction.
  * @param tr
- * @returns Min 'from', max 'to' (from + slice size). If no steps, returns pos range of entire doc.
+ * @returns Min 'from', max 'to' (from + slice size, or mapped 'to', whichever is larger). If no steps, returns pos range of entire doc.
  * Number of ReplaceStep and ReplaceAroundStep steps 'numReplaceSteps'.
  * 'isAllText' if all steps are represent adding inline text or a backspace/delete or no-op
  */

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

@@ -10,7 +10,6 @@ export declare const key: PluginKey<PluginState>;
 export interface FlagType {
     isNestedEnabled: boolean;
     isOptimisedApply: boolean;
-    isTitleEnterImprovementEnabled: boolean;
 }
 export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, anchorHeightsCache?: AnchorHeightsCache) => {
     decorations: DecorationSet;

package/dist/types-ts4.5/types.d.ts

@@ -60,7 +60,6 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     commands: {
         moveNode: (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;
-        hideDragHandle: () => EditorCommand;
         setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
     };
 }>;

package/dist/types-ts4.5/utils/transactions.d.ts

@@ -21,7 +21,7 @@ export declare const isStepDelete: (s: ReplaceStep) => boolean;
 /**
  * Get metadata from the transaction.
  * @param tr
- * @returns Min 'from', max 'to' (from + slice size). If no steps, returns pos range of entire doc.
+ * @returns Min 'from', max 'to' (from + slice size, or mapped 'to', whichever is larger). If no steps, returns pos range of entire doc.
  * Number of ReplaceStep and ReplaceAroundStep steps 'numReplaceSteps'.
  * 'isAllText' if all steps are represent adding inline text or a backspace/delete or no-op
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.6.1",
+	"version": "2.6.3",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^42.0.2",
-		"@atlaskit/editor-common": "^93.5.0",
+		"@atlaskit/editor-common": "^93.6.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^12.2.0",
 		"@atlaskit/theme": "^13.1.0",
-		"@atlaskit/tmp-editor-statsig": "^2.5.0",
+		"@atlaskit/tmp-editor-statsig": "^2.6.0",
 		"@atlaskit/tokens": "^2.0.0",
 		"@atlaskit/tooltip": "^18.8.0",
 		"@babel/runtime": "^7.0.0",
@@ -139,10 +139,10 @@
 		"platform_editor_element_dnd_nested_fix_patch_2": {
 			"type": "boolean"
 		},
-		"platform_editor_element_dnd_nested_type_error_fix": {
+		"platform_editor_element_dnd_nested_fix_patch_3": {
 			"type": "boolean"
 		},
-		"confluence_frontend_page_title_enter_improvements": {
+		"platform_editor_element_dnd_nested_type_error_fix": {
 			"type": "boolean"
 		},
 		"platform_editor_element_dnd_nested_a11y": {