@atlaskit/editor-plugin-expand 31.0.6 → 31.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-expand
 
+## 31.1.0
+
+### Minor Changes
+
+- [`8cf7f4ad181c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8cf7f4ad181c4) -
+  Backspace in an empty line after a collapsed expand deletes the line and moves the caret to the
+  end of the expand title, behind platform_editor_expand_delete_empty_line
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 31.0.6
 
 ### Patch Changes

package/dist/cjs/editor-commands/deleteEmptyLineAfterCollapsedExpand.js

@@ -0,0 +1,81 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deleteEmptyLineAfterCollapsedExpand = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("../utils");
+/**
+ * The empty paragraph holding the caret, when its previous sibling is a collapsed expand or nested
+ * expand and it is not the last child of its container. The last child is kept so there is always a
+ * line to type in after the expand.
+ */
+var getEmptyLineAfterCollapsedExpand = function getEmptyLineAfterCollapsedExpand(state, isCollapsed) {
+  var $from = state.selection.$from;
+  var _state$schema$nodes = state.schema.nodes,
+    paragraph = _state$schema$nodes.paragraph,
+    expand = _state$schema$nodes.expand,
+    nestedExpand = _state$schema$nodes.nestedExpand;
+  var textblock = $from.parent;
+  if (textblock.type !== paragraph || textblock.content.size > 0) {
+    return undefined;
+  }
+  var container = $from.node(-1);
+  var index = $from.index(-1);
+  var isLastChild = index === container.childCount - 1;
+  if (index === 0 || isLastChild) {
+    return undefined;
+  }
+  var previousSibling = container.child(index - 1);
+  var isExpand = previousSibling.type === expand || previousSibling.type === nestedExpand;
+  if (!isExpand || !isCollapsed(previousSibling)) {
+    return undefined;
+  }
+  var lineStart = $from.before();
+  return {
+    expandContentStart: lineStart - previousSibling.nodeSize + 1,
+    lineStart: lineStart,
+    lineEnd: $from.after()
+  };
+};
+/**
+ * Backspace in an empty line directly after a collapsed expand: deletes the line and moves focus to
+ * the end of the expand title, in one transaction. Returns false, without changing anything, when
+ * the caret is anywhere else or the title input cannot be found, so other Backspace handling runs.
+ */
+var deleteEmptyLineAfterCollapsedExpand = exports.deleteEmptyLineAfterCollapsedExpand = function deleteEmptyLineAfterCollapsedExpand(_ref) {
+  var focusTitle = _ref.focusTitle,
+    isCollapsed = _ref.isCollapsed;
+  return function (state, dispatch, editorView) {
+    if (!editorView || !state.selection.empty) {
+      return false;
+    }
+    var emptyLine = getEmptyLineAfterCollapsedExpand(state, isCollapsed);
+    if (!emptyLine) {
+      return false;
+    }
+    var titleInput = (0, _utils.getExpandTitleInput)(editorView, emptyLine.expandContentStart);
+    if (!titleInput) {
+      return false;
+    }
+    if (!dispatch) {
+      return true;
+    }
+    var tr = state.tr.delete(emptyLine.lineStart, emptyLine.lineEnd);
+    var selectionInsideExpand = _state.Selection.findFrom(tr.doc.resolve(emptyLine.expandContentStart), 1, true);
+    if (selectionInsideExpand) {
+      tr.setSelection(selectionInsideExpand);
+    }
+    dispatch(tr);
+    var titleInputAfterDelete = (0, _utils.getExpandTitleInput)(editorView, emptyLine.expandContentStart);
+    if (!(titleInputAfterDelete !== null && titleInputAfterDelete !== void 0 && titleInputAfterDelete.isConnected)) {
+      focusTitle(emptyLine.expandContentStart)(editorView.state, dispatch, editorView);
+      return true;
+    }
+    titleInputAfterDelete.focus();
+    var titleEnd = titleInputAfterDelete.value.length;
+    titleInputAfterDelete.setSelectionRange(titleEnd, titleEnd);
+    return true;
+  };
+};

package/dist/cjs/legacyExpand/commands.js

@@ -189,8 +189,7 @@ var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsA
 var focusTitle = exports.focusTitle = function focusTitle(pos) {
   return function (state, dispatch, editorView) {
     if (editorView) {
-      var dom = editorView.domAtPos(pos);
-      var expandWrapper = dom.node.parentElement;
+      var expandWrapper = (0, _utils3.getExpandWrapper)(editorView, pos);
       if (expandWrapper) {
         setSelectionInsideExpand(pos)(state, dispatch, editorView);
         var input = expandWrapper.querySelector('input');

package/dist/cjs/legacyExpand/pm-plugins/keymap.js

@@ -14,7 +14,9 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-tables/utils");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _deleteEmptyLineAfterCollapsedExpand = require("../../editor-commands/deleteEmptyLineAfterCollapsedExpand");
 var _commands = require("../commands");
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -24,6 +26,9 @@ var isExpandSelected = function isExpandSelected(selection) {
 };
 function expandKeymap(api, options) {
   var list = {};
+  var isCollapsed = function isCollapsed(expandNode) {
+    return options.__livePage ? expandNode.attrs.__expanded : !expandNode.attrs.__expanded;
+  };
   (0, _keymaps.bindKeymapWithCommand)(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -182,7 +187,13 @@ function expandKeymap(api, options) {
       // @see ED-7977
       var sel = _state.Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       var expandBefore = (0, _transforms.findExpand)(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && isCollapsed(expandBefore.node)) {
+        if ((0, _fg.fg)('platform_editor_expand_delete_empty_line') && (0, _deleteEmptyLineAfterCollapsedExpand.deleteEmptyLineAfterCollapsedExpand)({
+          focusTitle: _commands.focusTitle,
+          isCollapsed: isCollapsed
+        })(state, dispatch, editorView)) {
+          return true;
+        }
         return (0, _commands.focusTitle)(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/cjs/singlePlayerExpand/commands.js

@@ -226,8 +226,7 @@ var updateExpandTitle = exports.updateExpandTitle = function updateExpandTitle(_
 var focusTitle = exports.focusTitle = function focusTitle(pos) {
   return function (state, dispatch, editorView) {
     if (editorView) {
-      var dom = editorView.domAtPos(pos);
-      var expandWrapper = dom.node.parentElement;
+      var expandWrapper = (0, _utils3.getExpandWrapper)(editorView, pos);
       if (expandWrapper) {
         setSelectionInsideExpand(pos)(state, dispatch, editorView);
         var input = expandWrapper.querySelector('input');

package/dist/cjs/singlePlayerExpand/pm-plugins/keymap.js

@@ -14,7 +14,9 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-tables/utils");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _deleteEmptyLineAfterCollapsedExpand = require("../../editor-commands/deleteEmptyLineAfterCollapsedExpand");
 var _commands = require("../commands");
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -183,6 +185,12 @@ function expandKeymap(api) {
       var sel = _state.Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       var expandBefore = (0, _transforms.findExpand)(state, sel);
       if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (0, _expand2.isExpandCollapsed)(expandBefore.node)) {
+        if ((0, _fg.fg)('platform_editor_expand_delete_empty_line') && (0, _deleteEmptyLineAfterCollapsedExpand.deleteEmptyLineAfterCollapsedExpand)({
+          focusTitle: _commands.focusTitle,
+          isCollapsed: _expand2.isExpandCollapsed
+        })(state, dispatch, editorView)) {
+          return true;
+        }
         return (0, _commands.focusTitle)(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/cjs/utils.js

@@ -3,10 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isNestedInExpand = void 0;
+exports.isNestedInExpand = exports.getExpandWrapper = exports.getExpandTitleInput = void 0;
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var isNestedInExpand = exports.isNestedInExpand = function isNestedInExpand(state) {
   return (0, _utils.hasParentNode)(function (node) {
     return node.type === state.schema.nodes.expand || node.type === state.schema.nodes.nestedExpand;
   })(state.selection);
+};
+
+/** The element wrapping an expand's title and content, found from a position inside its content. */
+var getExpandWrapper = exports.getExpandWrapper = function getExpandWrapper(editorView, pos) {
+  return editorView.domAtPos(pos).node.parentElement;
+};
+
+/** The title input of the expand whose content contains `pos`. */
+var getExpandTitleInput = exports.getExpandTitleInput = function getExpandTitleInput(editorView, pos) {
+  var _getExpandWrapper$que, _getExpandWrapper;
+  return (_getExpandWrapper$que = (_getExpandWrapper = getExpandWrapper(editorView, pos)) === null || _getExpandWrapper === void 0 ? void 0 : _getExpandWrapper.querySelector('input')) !== null && _getExpandWrapper$que !== void 0 ? _getExpandWrapper$que : null;
 };

package/dist/es2019/editor-commands/deleteEmptyLineAfterCollapsedExpand.js

@@ -0,0 +1,77 @@
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { getExpandTitleInput } from '../utils';
+/**
+ * The empty paragraph holding the caret, when its previous sibling is a collapsed expand or nested
+ * expand and it is not the last child of its container. The last child is kept so there is always a
+ * line to type in after the expand.
+ */
+const getEmptyLineAfterCollapsedExpand = (state, isCollapsed) => {
+  const {
+    $from
+  } = state.selection;
+  const {
+    paragraph,
+    expand,
+    nestedExpand
+  } = state.schema.nodes;
+  const textblock = $from.parent;
+  if (textblock.type !== paragraph || textblock.content.size > 0) {
+    return undefined;
+  }
+  const container = $from.node(-1);
+  const index = $from.index(-1);
+  const isLastChild = index === container.childCount - 1;
+  if (index === 0 || isLastChild) {
+    return undefined;
+  }
+  const previousSibling = container.child(index - 1);
+  const isExpand = previousSibling.type === expand || previousSibling.type === nestedExpand;
+  if (!isExpand || !isCollapsed(previousSibling)) {
+    return undefined;
+  }
+  const lineStart = $from.before();
+  return {
+    expandContentStart: lineStart - previousSibling.nodeSize + 1,
+    lineStart,
+    lineEnd: $from.after()
+  };
+};
+/**
+ * Backspace in an empty line directly after a collapsed expand: deletes the line and moves focus to
+ * the end of the expand title, in one transaction. Returns false, without changing anything, when
+ * the caret is anywhere else or the title input cannot be found, so other Backspace handling runs.
+ */
+export const deleteEmptyLineAfterCollapsedExpand = ({
+  focusTitle,
+  isCollapsed
+}) => (state, dispatch, editorView) => {
+  if (!editorView || !state.selection.empty) {
+    return false;
+  }
+  const emptyLine = getEmptyLineAfterCollapsedExpand(state, isCollapsed);
+  if (!emptyLine) {
+    return false;
+  }
+  const titleInput = getExpandTitleInput(editorView, emptyLine.expandContentStart);
+  if (!titleInput) {
+    return false;
+  }
+  if (!dispatch) {
+    return true;
+  }
+  const tr = state.tr.delete(emptyLine.lineStart, emptyLine.lineEnd);
+  const selectionInsideExpand = Selection.findFrom(tr.doc.resolve(emptyLine.expandContentStart), 1, true);
+  if (selectionInsideExpand) {
+    tr.setSelection(selectionInsideExpand);
+  }
+  dispatch(tr);
+  const titleInputAfterDelete = getExpandTitleInput(editorView, emptyLine.expandContentStart);
+  if (!(titleInputAfterDelete !== null && titleInputAfterDelete !== void 0 && titleInputAfterDelete.isConnected)) {
+    focusTitle(emptyLine.expandContentStart)(editorView.state, dispatch, editorView);
+    return true;
+  }
+  titleInputAfterDelete.focus();
+  const titleEnd = titleInputAfterDelete.value.length;
+  titleInputAfterDelete.setSelectionRange(titleEnd, titleEnd);
+  return true;
+};

package/dist/es2019/legacyExpand/commands.js

@@ -9,7 +9,7 @@ import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils/cr
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { isNestedInExpand } from '../utils';
+import { getExpandWrapper, isNestedInExpand } from '../utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 export const setExpandRef = ref => createCommand({
   type: 'SET_EXPAND_REF',
@@ -171,8 +171,7 @@ export const insertExpand = editorAnalyticsAPI => (state, dispatch) => {
 };
 export const focusTitle = pos => (state, dispatch, editorView) => {
   if (editorView) {
-    const dom = editorView.domAtPos(pos);
-    const expandWrapper = dom.node.parentElement;
+    const expandWrapper = getExpandWrapper(editorView, pos);
     if (expandWrapper) {
       setSelectionInsideExpand(pos)(state, dispatch, editorView);
       const input = expandWrapper.querySelector('input');

package/dist/es2019/legacyExpand/pm-plugins/keymap.js

@@ -8,7 +8,9 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { deleteEmptyLineAfterCollapsedExpand } from '../../editor-commands/deleteEmptyLineAfterCollapsedExpand';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 const isExpandNode = node => {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -16,6 +18,7 @@ const isExpandNode = node => {
 const isExpandSelected = selection => selection instanceof NodeSelection && isExpandNode(selection.node);
 export function expandKeymap(api, options) {
   const list = {};
+  const isCollapsed = expandNode => options.__livePage ? expandNode.attrs.__expanded : !expandNode.attrs.__expanded;
   bindKeymapWithCommand(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -206,7 +209,13 @@ export function expandKeymap(api, options) {
       // @see ED-7977
       const sel = Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       const expandBefore = findExpand(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && isCollapsed(expandBefore.node)) {
+        if (fg('platform_editor_expand_delete_empty_line') && deleteEmptyLineAfterCollapsedExpand({
+          focusTitle,
+          isCollapsed
+        })(state, dispatch, editorView)) {
+          return true;
+        }
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/es2019/singlePlayerExpand/commands.js

@@ -15,7 +15,7 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { isNestedInExpand } from '../utils';
+import { getExpandWrapper, isNestedInExpand } from '../utils';
 
 // Creates either an expand or a nestedExpand node based on the current selection
 export const createExpandNode = (state, setExpandedState = true, addLocalId) => {
@@ -209,8 +209,7 @@ export const updateExpandTitle = ({
 };
 export const focusTitle = pos => (state, dispatch, editorView) => {
   if (editorView) {
-    const dom = editorView.domAtPos(pos);
-    const expandWrapper = dom.node.parentElement;
+    const expandWrapper = getExpandWrapper(editorView, pos);
     if (expandWrapper) {
       setSelectionInsideExpand(pos)(state, dispatch, editorView);
       const input = expandWrapper.querySelector('input');

package/dist/es2019/singlePlayerExpand/pm-plugins/keymap.js

@@ -8,7 +8,9 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { deleteEmptyLineAfterCollapsedExpand } from '../../editor-commands/deleteEmptyLineAfterCollapsedExpand';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 const isExpandNode = node => {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -207,6 +209,12 @@ export function expandKeymap(api) {
       const sel = Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       const expandBefore = findExpand(state, sel);
       if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && isExpandCollapsed(expandBefore.node)) {
+        if (fg('platform_editor_expand_delete_empty_line') && deleteEmptyLineAfterCollapsedExpand({
+          focusTitle,
+          isCollapsed: isExpandCollapsed
+        })(state, dispatch, editorView)) {
+          return true;
+        }
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/es2019/utils.js

@@ -1,2 +1,11 @@
 import { hasParentNode } from '@atlaskit/editor-prosemirror/utils';
-export const isNestedInExpand = state => hasParentNode(node => node.type === state.schema.nodes.expand || node.type === state.schema.nodes.nestedExpand)(state.selection);
+export const isNestedInExpand = state => hasParentNode(node => node.type === state.schema.nodes.expand || node.type === state.schema.nodes.nestedExpand)(state.selection);
+
+/** The element wrapping an expand's title and content, found from a position inside its content. */
+export const getExpandWrapper = (editorView, pos) => editorView.domAtPos(pos).node.parentElement;
+
+/** The title input of the expand whose content contains `pos`. */
+export const getExpandTitleInput = (editorView, pos) => {
+  var _getExpandWrapper$que, _getExpandWrapper;
+  return (_getExpandWrapper$que = (_getExpandWrapper = getExpandWrapper(editorView, pos)) === null || _getExpandWrapper === void 0 ? void 0 : _getExpandWrapper.querySelector('input')) !== null && _getExpandWrapper$que !== void 0 ? _getExpandWrapper$que : null;
+};

package/dist/esm/editor-commands/deleteEmptyLineAfterCollapsedExpand.js

@@ -0,0 +1,75 @@
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { getExpandTitleInput } from '../utils';
+/**
+ * The empty paragraph holding the caret, when its previous sibling is a collapsed expand or nested
+ * expand and it is not the last child of its container. The last child is kept so there is always a
+ * line to type in after the expand.
+ */
+var getEmptyLineAfterCollapsedExpand = function getEmptyLineAfterCollapsedExpand(state, isCollapsed) {
+  var $from = state.selection.$from;
+  var _state$schema$nodes = state.schema.nodes,
+    paragraph = _state$schema$nodes.paragraph,
+    expand = _state$schema$nodes.expand,
+    nestedExpand = _state$schema$nodes.nestedExpand;
+  var textblock = $from.parent;
+  if (textblock.type !== paragraph || textblock.content.size > 0) {
+    return undefined;
+  }
+  var container = $from.node(-1);
+  var index = $from.index(-1);
+  var isLastChild = index === container.childCount - 1;
+  if (index === 0 || isLastChild) {
+    return undefined;
+  }
+  var previousSibling = container.child(index - 1);
+  var isExpand = previousSibling.type === expand || previousSibling.type === nestedExpand;
+  if (!isExpand || !isCollapsed(previousSibling)) {
+    return undefined;
+  }
+  var lineStart = $from.before();
+  return {
+    expandContentStart: lineStart - previousSibling.nodeSize + 1,
+    lineStart: lineStart,
+    lineEnd: $from.after()
+  };
+};
+/**
+ * Backspace in an empty line directly after a collapsed expand: deletes the line and moves focus to
+ * the end of the expand title, in one transaction. Returns false, without changing anything, when
+ * the caret is anywhere else or the title input cannot be found, so other Backspace handling runs.
+ */
+export var deleteEmptyLineAfterCollapsedExpand = function deleteEmptyLineAfterCollapsedExpand(_ref) {
+  var focusTitle = _ref.focusTitle,
+    isCollapsed = _ref.isCollapsed;
+  return function (state, dispatch, editorView) {
+    if (!editorView || !state.selection.empty) {
+      return false;
+    }
+    var emptyLine = getEmptyLineAfterCollapsedExpand(state, isCollapsed);
+    if (!emptyLine) {
+      return false;
+    }
+    var titleInput = getExpandTitleInput(editorView, emptyLine.expandContentStart);
+    if (!titleInput) {
+      return false;
+    }
+    if (!dispatch) {
+      return true;
+    }
+    var tr = state.tr.delete(emptyLine.lineStart, emptyLine.lineEnd);
+    var selectionInsideExpand = Selection.findFrom(tr.doc.resolve(emptyLine.expandContentStart), 1, true);
+    if (selectionInsideExpand) {
+      tr.setSelection(selectionInsideExpand);
+    }
+    dispatch(tr);
+    var titleInputAfterDelete = getExpandTitleInput(editorView, emptyLine.expandContentStart);
+    if (!(titleInputAfterDelete !== null && titleInputAfterDelete !== void 0 && titleInputAfterDelete.isConnected)) {
+      focusTitle(emptyLine.expandContentStart)(editorView.state, dispatch, editorView);
+      return true;
+    }
+    titleInputAfterDelete.focus();
+    var titleEnd = titleInputAfterDelete.value.length;
+    titleInputAfterDelete.setSelectionRange(titleEnd, titleEnd);
+    return true;
+  };
+};

package/dist/esm/legacyExpand/commands.js

@@ -12,7 +12,7 @@ import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils/cr
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { isNestedInExpand } from '../utils';
+import { getExpandWrapper, isNestedInExpand } from '../utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 export var setExpandRef = function setExpandRef(ref) {
   return createCommand({
@@ -182,8 +182,7 @@ export var insertExpand = function insertExpand(editorAnalyticsAPI) {
 export var focusTitle = function focusTitle(pos) {
   return function (state, dispatch, editorView) {
     if (editorView) {
-      var dom = editorView.domAtPos(pos);
-      var expandWrapper = dom.node.parentElement;
+      var expandWrapper = getExpandWrapper(editorView, pos);
       if (expandWrapper) {
         setSelectionInsideExpand(pos)(state, dispatch, editorView);
         var input = expandWrapper.querySelector('input');

package/dist/esm/legacyExpand/pm-plugins/keymap.js

@@ -8,7 +8,9 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { deleteEmptyLineAfterCollapsedExpand } from '../../editor-commands/deleteEmptyLineAfterCollapsedExpand';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -18,6 +20,9 @@ var isExpandSelected = function isExpandSelected(selection) {
 };
 export function expandKeymap(api, options) {
   var list = {};
+  var isCollapsed = function isCollapsed(expandNode) {
+    return options.__livePage ? expandNode.attrs.__expanded : !expandNode.attrs.__expanded;
+  };
   bindKeymapWithCommand(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -176,7 +181,13 @@ export function expandKeymap(api, options) {
       // @see ED-7977
       var sel = Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       var expandBefore = findExpand(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && isCollapsed(expandBefore.node)) {
+        if (fg('platform_editor_expand_delete_empty_line') && deleteEmptyLineAfterCollapsedExpand({
+          focusTitle: focusTitle,
+          isCollapsed: isCollapsed
+        })(state, dispatch, editorView)) {
+          return true;
+        }
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/esm/singlePlayerExpand/commands.js

@@ -18,7 +18,7 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { isNestedInExpand } from '../utils';
+import { getExpandWrapper, isNestedInExpand } from '../utils';
 
 // Creates either an expand or a nestedExpand node based on the current selection
 export var createExpandNode = function createExpandNode(state) {
@@ -222,8 +222,7 @@ export var updateExpandTitle = function updateExpandTitle(_ref2) {
 export var focusTitle = function focusTitle(pos) {
   return function (state, dispatch, editorView) {
     if (editorView) {
-      var dom = editorView.domAtPos(pos);
-      var expandWrapper = dom.node.parentElement;
+      var expandWrapper = getExpandWrapper(editorView, pos);
       if (expandWrapper) {
         setSelectionInsideExpand(pos)(state, dispatch, editorView);
         var input = expandWrapper.querySelector('input');

package/dist/esm/singlePlayerExpand/pm-plugins/keymap.js

@@ -8,7 +8,9 @@ import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/uti
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { deleteEmptyLineAfterCollapsedExpand } from '../../editor-commands/deleteEmptyLineAfterCollapsedExpand';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
@@ -177,6 +179,12 @@ export function expandKeymap(api) {
       var sel = Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       var expandBefore = findExpand(state, sel);
       if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && isExpandCollapsed(expandBefore.node)) {
+        if (fg('platform_editor_expand_delete_empty_line') && deleteEmptyLineAfterCollapsedExpand({
+          focusTitle: focusTitle,
+          isCollapsed: isExpandCollapsed
+        })(state, dispatch, editorView)) {
+          return true;
+        }
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/esm/utils.js

@@ -3,4 +3,15 @@ export var isNestedInExpand = function isNestedInExpand(state) {
   return hasParentNode(function (node) {
     return node.type === state.schema.nodes.expand || node.type === state.schema.nodes.nestedExpand;
   })(state.selection);
+};
+
+/** The element wrapping an expand's title and content, found from a position inside its content. */
+export var getExpandWrapper = function getExpandWrapper(editorView, pos) {
+  return editorView.domAtPos(pos).node.parentElement;
+};
+
+/** The title input of the expand whose content contains `pos`. */
+export var getExpandTitleInput = function getExpandTitleInput(editorView, pos) {
+  var _getExpandWrapper$que, _getExpandWrapper;
+  return (_getExpandWrapper$que = (_getExpandWrapper = getExpandWrapper(editorView, pos)) === null || _getExpandWrapper === void 0 ? void 0 : _getExpandWrapper.querySelector('input')) !== null && _getExpandWrapper$que !== void 0 ? _getExpandWrapper$que : null;
 };

package/dist/types/editor-commands/deleteEmptyLineAfterCollapsedExpand.d.ts

@@ -0,0 +1,14 @@
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+type DeleteEmptyLineAfterCollapsedExpandOptions = {
+    /** The plugin's own `focusTitle`, used when the title input is re-rendered by the delete. */
+    focusTitle: (pos: number) => Command;
+    isCollapsed: (expandNode: PMNode) => boolean;
+};
+/**
+ * Backspace in an empty line directly after a collapsed expand: deletes the line and moves focus to
+ * the end of the expand title, in one transaction. Returns false, without changing anything, when
+ * the caret is anywhere else or the title input cannot be found, so other Backspace handling runs.
+ */
+export declare const deleteEmptyLineAfterCollapsedExpand: ({ focusTitle, isCollapsed }: DeleteEmptyLineAfterCollapsedExpandOptions) => Command;
+export {};

package/dist/types/utils.d.ts

@@ -1,2 +1,7 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const isNestedInExpand: (state: EditorState) => boolean;
+/** The element wrapping an expand's title and content, found from a position inside its content. */
+export declare const getExpandWrapper: (editorView: EditorView, pos: number) => HTMLElement | null;
+/** The title input of the expand whose content contains `pos`. */
+export declare const getExpandTitleInput: (editorView: EditorView, pos: number) => HTMLInputElement | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "31.0.6",
+	"version": "31.1.0",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/editor-plugin-selection": "^30.0.0",
 		"@atlaskit/editor-plugin-selection-marker": "^30.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
-		"@atlaskit/editor-shared-styles": "^4.6.0",
+		"@atlaskit/editor-shared-styles": "^5.0.0",
 		"@atlaskit/editor-tables": "^3.2.0",
 		"@atlaskit/editor-toolbar": "^2.8.0",
 		"@atlaskit/editor-ui-control-model": "^3.0.0",
@@ -52,7 +52,7 @@
 		"w3c-keyname": "^2.1.8"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^134.3.0",
+		"@atlaskit/editor-common": "^134.4.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -66,6 +66,9 @@
 	"platform-feature-flags": {
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
+		},
+		"platform_editor_expand_delete_empty_line": {
+			"type": "boolean"
 		}
 	}
 }