@atlaskit/editor-plugin-selection-extension 7.1.1 → 7.1.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-selection-extension
 
+## 7.1.3
+
+### Patch Changes
+
+- [`096e1ff839aa4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/096e1ff839aa4) -
+  Clean up `platform_editor_clear_active_extension_fix` feature gate
+- Updated dependencies
+
+## 7.1.2
+
+### Patch Changes
+
+- [`0b0f96c20a852`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b0f96c20a852) -
+  Improve getSelectionAdf api to return expanded selection
+
 ## 7.1.1
 
 ### Patch Changes

package/dist/cjs/pm-plugins/actions/replaceWithAdf.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.replaceWithAdf = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../../types");
 var _main = require("../main");
 var replaceWithAdf = exports.replaceWithAdf = function replaceWithAdf(nodeAdf, api) {
@@ -32,7 +33,7 @@ var replaceWithAdf = exports.replaceWithAdf = function replaceWithAdf(nodeAdf, a
       if (!selectedNode || nodePos === undefined) {
         throw new Error('No selected node or node position found');
       }
-      var endPos = selectedNode.nodeSize + nodePos;
+      var endPos = selectedNode.type.name === 'doc' && (0, _platformFeatureFlags.fg)('platform_editor_selection_extension_improvement') ? nodePos + selectedNode.content.size : nodePos + selectedNode.nodeSize;
       var modifiedNode = _model.Node.fromJSON(schema, nodeAdf);
       modifiedNode.check();
       var updatedTr = tr.replaceWith(nodePos, endPos, modifiedNode).scrollIntoView();
@@ -41,7 +42,7 @@ var replaceWithAdf = exports.replaceWithAdf = function replaceWithAdf(nodeAdf, a
       return {
         status: 'success'
       };
-    } catch (error) {
+    } catch (_unused) {
       dispatch(tr);
       return {
         status: 'failed-to-replace'

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

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../types");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -56,7 +55,7 @@ var createPlugin = exports.createPlugin = function createPlugin() {
           });
         }
         // clear activeExtension if the selection has changed and not empty
-        if (tr.selectionSet && !tr.selection.empty && (0, _platformFeatureFlags.fg)('platform_editor_clear_active_extension_fix')) {
+        if (tr.selectionSet && !tr.selection.empty) {
           return _objectSpread(_objectSpread({}, pluginState), {}, {
             activeExtension: undefined // Clear active extension on selection change
           });

package/dist/cjs/pm-plugins/utils/index.js

@@ -18,6 +18,7 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorTables = require("@atlaskit/editor-tables");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _getBoundingBoxFromSelection = require("../../ui/getBoundingBoxFromSelection");
+var _selectionHelpers = require("./selection-helpers");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getSelectedRect = function getSelectedRect(selection) {
@@ -29,24 +30,6 @@ var getSelectedRect = function getSelectedRect(selection) {
   var rect = map.rectBetween($anchorCell.pos - start, $headCell.pos - start);
   return rect;
 };
-var getSelectionInfoFromSameNode = function getSelectionInfoFromSameNode(selection) {
-  var $from = selection.$from,
-    $to = selection.$to;
-  return {
-    selectedNode: $from.node(),
-    selectionRanges: [{
-      start: {
-        pointer: "/content/".concat($from.index(), "/text"),
-        position: $from.parentOffset
-      },
-      end: {
-        pointer: "/content/".concat($from.index(), "/text"),
-        position: $to.parentOffset
-      }
-    }],
-    nodePos: $from.before() // position before the selection
-  };
-};
 var getSelectionInfoFromCellSelection = function getSelectionInfoFromCellSelection(selection) {
   var selectedNode = selection.$anchorCell.node(-1);
   var nodePos = selection.$anchorCell.before(-1);
@@ -117,12 +100,15 @@ function getSelectionAdfInfo(state) {
     nodePos: selection.$from.depth > 0 ? selection.$from.before() : selection.from
   };
   if (selection instanceof _state.TextSelection) {
-    var $from = selection.$from,
-      $to = selection.$to;
-    if ($from.parent === $to.parent) {
-      selectionInfo = getSelectionInfoFromSameNode(selection);
+    if ((0, _platformFeatureFlags.fg)('platform_editor_selection_extension_improvement')) {
+      // New implementation: unified handler for all text selections
+      selectionInfo = (0, _selectionHelpers.getSelectionInfo)(selection, state.schema);
     } else {
-      // TODO: ED-28405 - when selection spans multiple nodes including nested node, we need to iterate through the nodes
+      var $from = selection.$from,
+        $to = selection.$to;
+      if ($from.parent === $to.parent) {
+        selectionInfo = (0, _selectionHelpers.getSelectionInfoFromSameNode)(selection);
+      }
     }
   } else if (selection instanceof _editorTables.CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);
@@ -134,17 +120,20 @@ function getSelectionAdfInfo(state) {
   });
 }
 function getSelectionAdfInfoNew(selection) {
+  var schema = selection.$from.doc.type.schema;
   var selectionInfo = {
     selectedNode: selection.$from.node(),
     nodePos: selection.$from.depth > 0 ? selection.$from.before() : selection.from
   };
   if (selection instanceof _state.TextSelection) {
-    var $from = selection.$from,
-      $to = selection.$to;
-    if ($from.parent === $to.parent) {
-      selectionInfo = getSelectionInfoFromSameNode(selection);
+    if ((0, _platformFeatureFlags.fg)('platform_editor_selection_extension_improvement')) {
+      selectionInfo = (0, _selectionHelpers.getSelectionInfo)(selection, schema);
     } else {
-      // TODO: ED-28405 - when selection spans multiple nodes including nested node, we need to iterate through the nodes
+      var $from = selection.$from,
+        $to = selection.$to;
+      if ($from.parent === $to.parent) {
+        selectionInfo = (0, _selectionHelpers.getSelectionInfoFromSameNode)(selection);
+      }
     }
   } else if (selection instanceof _editorTables.CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);

package/dist/cjs/pm-plugins/utils/selection-helpers.js

@@ -0,0 +1,168 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wrapNodesInDoc = exports.getSelectionInfoFromSameNode = exports.getSelectionInfo = exports.getCommonParentContainer = void 0;
+var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var LIST_ITEM_TYPES = new Set(['taskItem', 'decisionItem', 'listItem']);
+var LIST_NODE_TYPES = new Set(['taskList', 'bulletList', 'orderedList', 'decisionList']);
+
+/**
+ * Find the depth of the deepest common ancestor node.
+ */
+var getCommonAncestorDepth = function getCommonAncestorDepth($from, $to) {
+  var minDepth = Math.min($from.depth, $to.depth);
+  for (var d = 0; d <= minDepth; d++) {
+    if ($from.node(d) !== $to.node(d)) {
+      return d - 1;
+    }
+  }
+  return minDepth;
+};
+
+/**
+ * Find the closest parent container node that contains the selection.
+ * - For lists: returns the topmost list (to handle nested lists)
+ * - For other containers returns the closest one
+ * Returns the parent and its position.
+ */
+var getCommonParentContainer = exports.getCommonParentContainer = function getCommonParentContainer($from, $to) {
+  var commonDepth = getCommonAncestorDepth($from, $to);
+
+  // Single pass: look for topmost list OR first non-list parent
+  var topMostList = null;
+  var topMostListPos = -1;
+  var firstNonListParent = null;
+  var firstNonListParentPos = -1;
+  for (var depth = commonDepth; depth > 0; depth--) {
+    var node = $from.node(depth);
+    if (LIST_NODE_TYPES.has(node.type.name)) {
+      // Keep updating to find the topmost list (last one found going upward)
+      topMostList = node;
+      topMostListPos = $from.before(depth);
+    } else if (!firstNonListParent && node.type.name !== 'doc') {
+      // Only capture the first (innermost) non-list parent
+      firstNonListParent = node;
+      firstNonListParentPos = $from.before(depth);
+    }
+  }
+
+  // Return topmost list if found, else first non-list parent
+  if (topMostList) {
+    return {
+      node: topMostList,
+      pos: topMostListPos
+    };
+  }
+  return {
+    node: firstNonListParent,
+    pos: firstNonListParentPos
+  };
+};
+
+/**
+ * Wraps nodes in a doc fragment if there are multiple nodes
+ */
+var wrapNodesInDoc = exports.wrapNodesInDoc = function wrapNodesInDoc(schema, nodes) {
+  if (nodes.length === 0) {
+    return schema.nodes.doc.createChecked({}, _model.Fragment.empty);
+  }
+
+  // Single node: return unwrapped
+  if (nodes.length === 1) {
+    return nodes[0];
+  }
+
+  // For multiple nodes, wrap in doc
+  try {
+    return schema.node('doc', null, _model.Fragment.from(nodes));
+  } catch (error) {
+    (0, _monitoring.logException)(error, {
+      location: 'editor-plugin-selection-extension'
+    });
+    return schema.nodes.doc.createChecked({}, _model.Fragment.empty);
+  }
+};
+var getSelectionInfoFromSameNode = exports.getSelectionInfoFromSameNode = function getSelectionInfoFromSameNode(selection) {
+  var $from = selection.$from,
+    $to = selection.$to;
+  return {
+    selectedNode: $from.node(),
+    selectionRanges: [{
+      start: {
+        pointer: "/content/".concat($from.index(), "/text"),
+        position: $from.parentOffset
+      },
+      end: {
+        pointer: "/content/".concat($from.index(), "/text"),
+        position: $to.parentOffset
+      }
+    }],
+    nodePos: $from.before()
+  };
+};
+var getSelectionInfo = exports.getSelectionInfo = function getSelectionInfo(selection, schema) {
+  var $from = selection.$from,
+    $to = selection.$to;
+
+  // For same parent selections, check for parent container
+  if ($from.parent === $to.parent) {
+    var _getCommonParentConta = getCommonParentContainer($from, $to),
+      parentNode = _getCommonParentConta.node,
+      parentNodePos = _getCommonParentConta.pos;
+    if (parentNode) {
+      return {
+        selectedNode: parentNode,
+        nodePos: parentNodePos
+      };
+    }
+    var nodePos = $from.before();
+    return {
+      selectedNode: $from.node(),
+      nodePos: nodePos
+    };
+  }
+
+  // find the common ancestor
+  var range = $from.blockRange($to);
+  if (!range) {
+    return {
+      selectedNode: $from.node(),
+      nodePos: $from.depth > 0 ? $from.before() : $from.pos
+    };
+  }
+  if (range.parent.type.name !== 'doc') {
+    // If it's a list OR list item, check for topmost list parent
+    if (LIST_NODE_TYPES.has(range.parent.type.name) || LIST_ITEM_TYPES.has(range.parent.type.name)) {
+      var _getCommonParentConta2 = getCommonParentContainer($from, $to),
+        topList = _getCommonParentConta2.node,
+        topListPos = _getCommonParentConta2.pos;
+      if (topList) {
+        return {
+          selectedNode: topList,
+          nodePos: topListPos
+        };
+      }
+    }
+
+    // For non-list containers (panel, expand, etc.), return the immediate parent
+    var _nodePos = range.depth > 0 ? $from.before(range.depth) : 0;
+    return {
+      selectedNode: range.parent,
+      nodePos: _nodePos
+    };
+  }
+
+  // Extract complete nodes within the block range
+  var nodes = [];
+  for (var i = range.startIndex; i < range.endIndex; i++) {
+    nodes.push(range.parent.child(i));
+  }
+  var selectedNode = wrapNodesInDoc(schema, nodes);
+  return {
+    selectedNode: selectedNode,
+    nodePos: range.start
+  };
+};

package/dist/es2019/pm-plugins/actions/replaceWithAdf.js

@@ -1,4 +1,5 @@
 import { Node } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SelectionExtensionActionTypes } from '../../types';
 import { selectionExtensionPluginKey } from '../main';
 export const replaceWithAdf = (nodeAdf, api) => (state, dispatch) => {
@@ -27,7 +28,7 @@ export const replaceWithAdf = (nodeAdf, api) => (state, dispatch) => {
     if (!selectedNode || nodePos === undefined) {
       throw new Error('No selected node or node position found');
     }
-    const endPos = selectedNode.nodeSize + nodePos;
+    const endPos = selectedNode.type.name === 'doc' && fg('platform_editor_selection_extension_improvement') ? nodePos + selectedNode.content.size : nodePos + selectedNode.nodeSize;
     const modifiedNode = Node.fromJSON(schema, nodeAdf);
     modifiedNode.check();
     const updatedTr = tr.replaceWith(nodePos, endPos, modifiedNode).scrollIntoView();
@@ -36,7 +37,7 @@ export const replaceWithAdf = (nodeAdf, api) => (state, dispatch) => {
     return {
       status: 'success'
     };
-  } catch (error) {
+  } catch {
     dispatch(tr);
     return {
       status: 'failed-to-replace'

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

@@ -1,7 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SelectionExtensionActionTypes } from '../types';
 export const selectionExtensionPluginKey = new PluginKey('selectionExtensionPlugin');
 export const createPlugin = () => {
@@ -49,7 +48,7 @@ export const createPlugin = () => {
           };
         }
         // clear activeExtension if the selection has changed and not empty
-        if (tr.selectionSet && !tr.selection.empty && fg('platform_editor_clear_active_extension_fix')) {
+        if (tr.selectionSet && !tr.selection.empty) {
           return {
             ...pluginState,
             activeExtension: undefined // Clear active extension on selection change

package/dist/es2019/pm-plugins/utils/index.js

@@ -7,6 +7,7 @@ import { akEditorFullPageToolbarHeight } from '@atlaskit/editor-shared-styles';
 import { CellSelection, TableMap } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { getBoundingBoxFromSelection } from '../../ui/getBoundingBoxFromSelection';
+import { getSelectionInfo, getSelectionInfoFromSameNode } from './selection-helpers';
 const getSelectedRect = selection => {
   const {
     $anchorCell,
@@ -18,26 +19,6 @@ const getSelectedRect = selection => {
   const rect = map.rectBetween($anchorCell.pos - start, $headCell.pos - start);
   return rect;
 };
-const getSelectionInfoFromSameNode = selection => {
-  const {
-    $from,
-    $to
-  } = selection;
-  return {
-    selectedNode: $from.node(),
-    selectionRanges: [{
-      start: {
-        pointer: `/content/${$from.index()}/text`,
-        position: $from.parentOffset
-      },
-      end: {
-        pointer: `/content/${$from.index()}/text`,
-        position: $to.parentOffset
-      }
-    }],
-    nodePos: $from.before() // position before the selection
-  };
-};
 const getSelectionInfoFromCellSelection = selection => {
   const selectedNode = selection.$anchorCell.node(-1);
   const nodePos = selection.$anchorCell.before(-1);
@@ -116,14 +97,17 @@ export function getSelectionAdfInfo(state) {
     nodePos: selection.$from.depth > 0 ? selection.$from.before() : selection.from
   };
   if (selection instanceof TextSelection) {
-    const {
-      $from,
-      $to
-    } = selection;
-    if ($from.parent === $to.parent) {
-      selectionInfo = getSelectionInfoFromSameNode(selection);
+    if (fg('platform_editor_selection_extension_improvement')) {
+      // New implementation: unified handler for all text selections
+      selectionInfo = getSelectionInfo(selection, state.schema);
     } else {
-      // TODO: ED-28405 - when selection spans multiple nodes including nested node, we need to iterate through the nodes
+      const {
+        $from,
+        $to
+      } = selection;
+      if ($from.parent === $to.parent) {
+        selectionInfo = getSelectionInfoFromSameNode(selection);
+      }
     }
   } else if (selection instanceof CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);
@@ -136,19 +120,22 @@ export function getSelectionAdfInfo(state) {
   };
 }
 export function getSelectionAdfInfoNew(selection) {
+  const schema = selection.$from.doc.type.schema;
   let selectionInfo = {
     selectedNode: selection.$from.node(),
     nodePos: selection.$from.depth > 0 ? selection.$from.before() : selection.from
   };
   if (selection instanceof TextSelection) {
-    const {
-      $from,
-      $to
-    } = selection;
-    if ($from.parent === $to.parent) {
-      selectionInfo = getSelectionInfoFromSameNode(selection);
+    if (fg('platform_editor_selection_extension_improvement')) {
+      selectionInfo = getSelectionInfo(selection, schema);
     } else {
-      // TODO: ED-28405 - when selection spans multiple nodes including nested node, we need to iterate through the nodes
+      const {
+        $from,
+        $to
+      } = selection;
+      if ($from.parent === $to.parent) {
+        selectionInfo = getSelectionInfoFromSameNode(selection);
+      }
     }
   } else if (selection instanceof CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);

package/dist/es2019/pm-plugins/utils/selection-helpers.js

@@ -0,0 +1,168 @@
+import { logException } from '@atlaskit/editor-common/monitoring';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+const LIST_ITEM_TYPES = new Set(['taskItem', 'decisionItem', 'listItem']);
+const LIST_NODE_TYPES = new Set(['taskList', 'bulletList', 'orderedList', 'decisionList']);
+
+/**
+ * Find the depth of the deepest common ancestor node.
+ */
+const getCommonAncestorDepth = ($from, $to) => {
+  const minDepth = Math.min($from.depth, $to.depth);
+  for (let d = 0; d <= minDepth; d++) {
+    if ($from.node(d) !== $to.node(d)) {
+      return d - 1;
+    }
+  }
+  return minDepth;
+};
+
+/**
+ * Find the closest parent container node that contains the selection.
+ * - For lists: returns the topmost list (to handle nested lists)
+ * - For other containers returns the closest one
+ * Returns the parent and its position.
+ */
+export const getCommonParentContainer = ($from, $to) => {
+  const commonDepth = getCommonAncestorDepth($from, $to);
+
+  // Single pass: look for topmost list OR first non-list parent
+  let topMostList = null;
+  let topMostListPos = -1;
+  let firstNonListParent = null;
+  let firstNonListParentPos = -1;
+  for (let depth = commonDepth; depth > 0; depth--) {
+    const node = $from.node(depth);
+    if (LIST_NODE_TYPES.has(node.type.name)) {
+      // Keep updating to find the topmost list (last one found going upward)
+      topMostList = node;
+      topMostListPos = $from.before(depth);
+    } else if (!firstNonListParent && node.type.name !== 'doc') {
+      // Only capture the first (innermost) non-list parent
+      firstNonListParent = node;
+      firstNonListParentPos = $from.before(depth);
+    }
+  }
+
+  // Return topmost list if found, else first non-list parent
+  if (topMostList) {
+    return {
+      node: topMostList,
+      pos: topMostListPos
+    };
+  }
+  return {
+    node: firstNonListParent,
+    pos: firstNonListParentPos
+  };
+};
+
+/**
+ * Wraps nodes in a doc fragment if there are multiple nodes
+ */
+export const wrapNodesInDoc = (schema, nodes) => {
+  if (nodes.length === 0) {
+    return schema.nodes.doc.createChecked({}, Fragment.empty);
+  }
+
+  // Single node: return unwrapped
+  if (nodes.length === 1) {
+    return nodes[0];
+  }
+
+  // For multiple nodes, wrap in doc
+  try {
+    return schema.node('doc', null, Fragment.from(nodes));
+  } catch (error) {
+    logException(error, {
+      location: 'editor-plugin-selection-extension'
+    });
+    return schema.nodes.doc.createChecked({}, Fragment.empty);
+  }
+};
+export const getSelectionInfoFromSameNode = selection => {
+  const {
+    $from,
+    $to
+  } = selection;
+  return {
+    selectedNode: $from.node(),
+    selectionRanges: [{
+      start: {
+        pointer: `/content/${$from.index()}/text`,
+        position: $from.parentOffset
+      },
+      end: {
+        pointer: `/content/${$from.index()}/text`,
+        position: $to.parentOffset
+      }
+    }],
+    nodePos: $from.before()
+  };
+};
+export const getSelectionInfo = (selection, schema) => {
+  const {
+    $from,
+    $to
+  } = selection;
+
+  // For same parent selections, check for parent container
+  if ($from.parent === $to.parent) {
+    const {
+      node: parentNode,
+      pos: parentNodePos
+    } = getCommonParentContainer($from, $to);
+    if (parentNode) {
+      return {
+        selectedNode: parentNode,
+        nodePos: parentNodePos
+      };
+    }
+    const nodePos = $from.before();
+    return {
+      selectedNode: $from.node(),
+      nodePos
+    };
+  }
+
+  // find the common ancestor
+  const range = $from.blockRange($to);
+  if (!range) {
+    return {
+      selectedNode: $from.node(),
+      nodePos: $from.depth > 0 ? $from.before() : $from.pos
+    };
+  }
+  if (range.parent.type.name !== 'doc') {
+    // If it's a list OR list item, check for topmost list parent
+    if (LIST_NODE_TYPES.has(range.parent.type.name) || LIST_ITEM_TYPES.has(range.parent.type.name)) {
+      const {
+        node: topList,
+        pos: topListPos
+      } = getCommonParentContainer($from, $to);
+      if (topList) {
+        return {
+          selectedNode: topList,
+          nodePos: topListPos
+        };
+      }
+    }
+
+    // For non-list containers (panel, expand, etc.), return the immediate parent
+    const nodePos = range.depth > 0 ? $from.before(range.depth) : 0;
+    return {
+      selectedNode: range.parent,
+      nodePos
+    };
+  }
+
+  // Extract complete nodes within the block range
+  const nodes = [];
+  for (let i = range.startIndex; i < range.endIndex; i++) {
+    nodes.push(range.parent.child(i));
+  }
+  const selectedNode = wrapNodesInDoc(schema, nodes);
+  return {
+    selectedNode,
+    nodePos: range.start
+  };
+};

package/dist/esm/pm-plugins/actions/replaceWithAdf.js

@@ -1,4 +1,5 @@
 import { Node } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SelectionExtensionActionTypes } from '../../types';
 import { selectionExtensionPluginKey } from '../main';
 export var replaceWithAdf = function replaceWithAdf(nodeAdf, api) {
@@ -26,7 +27,7 @@ export var replaceWithAdf = function replaceWithAdf(nodeAdf, api) {
       if (!selectedNode || nodePos === undefined) {
         throw new Error('No selected node or node position found');
       }
-      var endPos = selectedNode.nodeSize + nodePos;
+      var endPos = selectedNode.type.name === 'doc' && fg('platform_editor_selection_extension_improvement') ? nodePos + selectedNode.content.size : nodePos + selectedNode.nodeSize;
       var modifiedNode = Node.fromJSON(schema, nodeAdf);
       modifiedNode.check();
       var updatedTr = tr.replaceWith(nodePos, endPos, modifiedNode).scrollIntoView();
@@ -35,7 +36,7 @@ export var replaceWithAdf = function replaceWithAdf(nodeAdf, api) {
       return {
         status: 'success'
       };
-    } catch (error) {
+    } catch (_unused) {
       dispatch(tr);
       return {
         status: 'failed-to-replace'

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

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SelectionExtensionActionTypes } from '../types';
 export var selectionExtensionPluginKey = new PluginKey('selectionExtensionPlugin');
 export var createPlugin = function createPlugin() {
@@ -49,7 +48,7 @@ export var createPlugin = function createPlugin() {
           });
         }
         // clear activeExtension if the selection has changed and not empty
-        if (tr.selectionSet && !tr.selection.empty && fg('platform_editor_clear_active_extension_fix')) {
+        if (tr.selectionSet && !tr.selection.empty) {
           return _objectSpread(_objectSpread({}, pluginState), {}, {
             activeExtension: undefined // Clear active extension on selection change
           });

package/dist/esm/pm-plugins/utils/index.js

@@ -10,6 +10,7 @@ import { akEditorFullPageToolbarHeight } from '@atlaskit/editor-shared-styles';
 import { CellSelection, TableMap } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { getBoundingBoxFromSelection } from '../../ui/getBoundingBoxFromSelection';
+import { getSelectionInfo, getSelectionInfoFromSameNode } from './selection-helpers';
 var getSelectedRect = function getSelectedRect(selection) {
   var $anchorCell = selection.$anchorCell,
     $headCell = selection.$headCell;
@@ -19,24 +20,6 @@ var getSelectedRect = function getSelectedRect(selection) {
   var rect = map.rectBetween($anchorCell.pos - start, $headCell.pos - start);
   return rect;
 };
-var getSelectionInfoFromSameNode = function getSelectionInfoFromSameNode(selection) {
-  var $from = selection.$from,
-    $to = selection.$to;
-  return {
-    selectedNode: $from.node(),
-    selectionRanges: [{
-      start: {
-        pointer: "/content/".concat($from.index(), "/text"),
-        position: $from.parentOffset
-      },
-      end: {
-        pointer: "/content/".concat($from.index(), "/text"),
-        position: $to.parentOffset
-      }
-    }],
-    nodePos: $from.before() // position before the selection
-  };
-};
 var getSelectionInfoFromCellSelection = function getSelectionInfoFromCellSelection(selection) {
   var selectedNode = selection.$anchorCell.node(-1);
   var nodePos = selection.$anchorCell.before(-1);
@@ -107,12 +90,15 @@ export function getSelectionAdfInfo(state) {
     nodePos: selection.$from.depth > 0 ? selection.$from.before() : selection.from
   };
   if (selection instanceof TextSelection) {
-    var $from = selection.$from,
-      $to = selection.$to;
-    if ($from.parent === $to.parent) {
-      selectionInfo = getSelectionInfoFromSameNode(selection);
+    if (fg('platform_editor_selection_extension_improvement')) {
+      // New implementation: unified handler for all text selections
+      selectionInfo = getSelectionInfo(selection, state.schema);
     } else {
-      // TODO: ED-28405 - when selection spans multiple nodes including nested node, we need to iterate through the nodes
+      var $from = selection.$from,
+        $to = selection.$to;
+      if ($from.parent === $to.parent) {
+        selectionInfo = getSelectionInfoFromSameNode(selection);
+      }
     }
   } else if (selection instanceof CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);
@@ -124,17 +110,20 @@ export function getSelectionAdfInfo(state) {
   });
 }
 export function getSelectionAdfInfoNew(selection) {
+  var schema = selection.$from.doc.type.schema;
   var selectionInfo = {
     selectedNode: selection.$from.node(),
     nodePos: selection.$from.depth > 0 ? selection.$from.before() : selection.from
   };
   if (selection instanceof TextSelection) {
-    var $from = selection.$from,
-      $to = selection.$to;
-    if ($from.parent === $to.parent) {
-      selectionInfo = getSelectionInfoFromSameNode(selection);
+    if (fg('platform_editor_selection_extension_improvement')) {
+      selectionInfo = getSelectionInfo(selection, schema);
     } else {
-      // TODO: ED-28405 - when selection spans multiple nodes including nested node, we need to iterate through the nodes
+      var $from = selection.$from,
+        $to = selection.$to;
+      if ($from.parent === $to.parent) {
+        selectionInfo = getSelectionInfoFromSameNode(selection);
+      }
     }
   } else if (selection instanceof CellSelection) {
     selectionInfo = getSelectionInfoFromCellSelection(selection);

package/dist/esm/pm-plugins/utils/selection-helpers.js

@@ -0,0 +1,162 @@
+import { logException } from '@atlaskit/editor-common/monitoring';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+var LIST_ITEM_TYPES = new Set(['taskItem', 'decisionItem', 'listItem']);
+var LIST_NODE_TYPES = new Set(['taskList', 'bulletList', 'orderedList', 'decisionList']);
+
+/**
+ * Find the depth of the deepest common ancestor node.
+ */
+var getCommonAncestorDepth = function getCommonAncestorDepth($from, $to) {
+  var minDepth = Math.min($from.depth, $to.depth);
+  for (var d = 0; d <= minDepth; d++) {
+    if ($from.node(d) !== $to.node(d)) {
+      return d - 1;
+    }
+  }
+  return minDepth;
+};
+
+/**
+ * Find the closest parent container node that contains the selection.
+ * - For lists: returns the topmost list (to handle nested lists)
+ * - For other containers returns the closest one
+ * Returns the parent and its position.
+ */
+export var getCommonParentContainer = function getCommonParentContainer($from, $to) {
+  var commonDepth = getCommonAncestorDepth($from, $to);
+
+  // Single pass: look for topmost list OR first non-list parent
+  var topMostList = null;
+  var topMostListPos = -1;
+  var firstNonListParent = null;
+  var firstNonListParentPos = -1;
+  for (var depth = commonDepth; depth > 0; depth--) {
+    var node = $from.node(depth);
+    if (LIST_NODE_TYPES.has(node.type.name)) {
+      // Keep updating to find the topmost list (last one found going upward)
+      topMostList = node;
+      topMostListPos = $from.before(depth);
+    } else if (!firstNonListParent && node.type.name !== 'doc') {
+      // Only capture the first (innermost) non-list parent
+      firstNonListParent = node;
+      firstNonListParentPos = $from.before(depth);
+    }
+  }
+
+  // Return topmost list if found, else first non-list parent
+  if (topMostList) {
+    return {
+      node: topMostList,
+      pos: topMostListPos
+    };
+  }
+  return {
+    node: firstNonListParent,
+    pos: firstNonListParentPos
+  };
+};
+
+/**
+ * Wraps nodes in a doc fragment if there are multiple nodes
+ */
+export var wrapNodesInDoc = function wrapNodesInDoc(schema, nodes) {
+  if (nodes.length === 0) {
+    return schema.nodes.doc.createChecked({}, Fragment.empty);
+  }
+
+  // Single node: return unwrapped
+  if (nodes.length === 1) {
+    return nodes[0];
+  }
+
+  // For multiple nodes, wrap in doc
+  try {
+    return schema.node('doc', null, Fragment.from(nodes));
+  } catch (error) {
+    logException(error, {
+      location: 'editor-plugin-selection-extension'
+    });
+    return schema.nodes.doc.createChecked({}, Fragment.empty);
+  }
+};
+export var getSelectionInfoFromSameNode = function getSelectionInfoFromSameNode(selection) {
+  var $from = selection.$from,
+    $to = selection.$to;
+  return {
+    selectedNode: $from.node(),
+    selectionRanges: [{
+      start: {
+        pointer: "/content/".concat($from.index(), "/text"),
+        position: $from.parentOffset
+      },
+      end: {
+        pointer: "/content/".concat($from.index(), "/text"),
+        position: $to.parentOffset
+      }
+    }],
+    nodePos: $from.before()
+  };
+};
+export var getSelectionInfo = function getSelectionInfo(selection, schema) {
+  var $from = selection.$from,
+    $to = selection.$to;
+
+  // For same parent selections, check for parent container
+  if ($from.parent === $to.parent) {
+    var _getCommonParentConta = getCommonParentContainer($from, $to),
+      parentNode = _getCommonParentConta.node,
+      parentNodePos = _getCommonParentConta.pos;
+    if (parentNode) {
+      return {
+        selectedNode: parentNode,
+        nodePos: parentNodePos
+      };
+    }
+    var nodePos = $from.before();
+    return {
+      selectedNode: $from.node(),
+      nodePos: nodePos
+    };
+  }
+
+  // find the common ancestor
+  var range = $from.blockRange($to);
+  if (!range) {
+    return {
+      selectedNode: $from.node(),
+      nodePos: $from.depth > 0 ? $from.before() : $from.pos
+    };
+  }
+  if (range.parent.type.name !== 'doc') {
+    // If it's a list OR list item, check for topmost list parent
+    if (LIST_NODE_TYPES.has(range.parent.type.name) || LIST_ITEM_TYPES.has(range.parent.type.name)) {
+      var _getCommonParentConta2 = getCommonParentContainer($from, $to),
+        topList = _getCommonParentConta2.node,
+        topListPos = _getCommonParentConta2.pos;
+      if (topList) {
+        return {
+          selectedNode: topList,
+          nodePos: topListPos
+        };
+      }
+    }
+
+    // For non-list containers (panel, expand, etc.), return the immediate parent
+    var _nodePos = range.depth > 0 ? $from.before(range.depth) : 0;
+    return {
+      selectedNode: range.parent,
+      nodePos: _nodePos
+    };
+  }
+
+  // Extract complete nodes within the block range
+  var nodes = [];
+  for (var i = range.startIndex; i < range.endIndex; i++) {
+    nodes.push(range.parent.child(i));
+  }
+  var selectedNode = wrapNodesInDoc(schema, nodes);
+  return {
+    selectedNode: selectedNode,
+    nodePos: range.start
+  };
+};

package/dist/types/pm-plugins/utils/selection-helpers.d.ts

@@ -0,0 +1,34 @@
+import { type Node as PMNode, type ResolvedPos, type Schema } from '@atlaskit/editor-prosemirror/model';
+import type { TextSelection } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Find the closest parent container node that contains the selection.
+ * - For lists: returns the topmost list (to handle nested lists)
+ * - For other containers returns the closest one
+ * Returns the parent and its position.
+ */
+export declare const getCommonParentContainer: ($from: ResolvedPos, $to: ResolvedPos) => {
+    node: PMNode | null;
+    pos: number;
+};
+/**
+ * Wraps nodes in a doc fragment if there are multiple nodes
+ */
+export declare const wrapNodesInDoc: (schema: Schema, nodes: PMNode[]) => PMNode;
+export declare const getSelectionInfoFromSameNode: (selection: TextSelection) => {
+    selectedNode: PMNode;
+    selectionRanges: {
+        start: {
+            pointer: string;
+            position: number;
+        };
+        end: {
+            pointer: string;
+            position: number;
+        };
+    }[];
+    nodePos: number;
+};
+export declare const getSelectionInfo: (selection: TextSelection, schema: Schema) => {
+    selectedNode: PMNode;
+    nodePos: number;
+};

package/dist/types-ts4.5/pm-plugins/utils/selection-helpers.d.ts

@@ -0,0 +1,34 @@
+import { type Node as PMNode, type ResolvedPos, type Schema } from '@atlaskit/editor-prosemirror/model';
+import type { TextSelection } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Find the closest parent container node that contains the selection.
+ * - For lists: returns the topmost list (to handle nested lists)
+ * - For other containers returns the closest one
+ * Returns the parent and its position.
+ */
+export declare const getCommonParentContainer: ($from: ResolvedPos, $to: ResolvedPos) => {
+    node: PMNode | null;
+    pos: number;
+};
+/**
+ * Wraps nodes in a doc fragment if there are multiple nodes
+ */
+export declare const wrapNodesInDoc: (schema: Schema, nodes: PMNode[]) => PMNode;
+export declare const getSelectionInfoFromSameNode: (selection: TextSelection) => {
+    selectedNode: PMNode;
+    selectionRanges: {
+        start: {
+            pointer: string;
+            position: number;
+        };
+        end: {
+            pointer: string;
+            position: number;
+        };
+    }[];
+    nodePos: number;
+};
+export declare const getSelectionInfo: (selection: TextSelection, schema: Schema) => {
+    selectedNode: PMNode;
+    nodePos: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-extension",
-	"version": "7.1.1",
+	"version": "7.1.3",
 	"description": "editor-plugin-selection-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"@atlaskit/adf-utils": "^19.26.0",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-menu": "^5.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^5.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^6.1.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^7.0.0",
@@ -49,14 +49,14 @@
 		"@atlaskit/icon": "^29.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
-		"@atlaskit/tmp-editor-statsig": "^14.1.0",
+		"@atlaskit/tmp-editor-statsig": "^14.5.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"react-intl-next": "npm:react-intl@^5.18.1",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.36.0",
+		"@atlaskit/editor-common": "^110.38.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -103,10 +103,10 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_clear_active_extension_fix": {
+		"platform_editor_use_preferences_plugin": {
 			"type": "boolean"
 		},
-		"platform_editor_use_preferences_plugin": {
+		"platform_editor_selection_extension_improvement": {
 			"type": "boolean"
 		}
 	}