@atlaskit/editor-plugin-expand 2.5.0 → 2.5.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-expand
 
+## 2.5.1
+
+### Patch Changes
+
+- [#129932](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129932)
+  [`d6a093f919beb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d6a093f919beb) -
+  [ED-24588] When inserting an expand with an existing expand selected, insert expand below the
+  expand
+
 ## 2.5.0
 
 ### Minor Changes

package/dist/cjs/legacyExpand/commands.js

@@ -14,8 +14,9 @@ var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _utils4 = require("../utils");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
-var _utils4 = require("./utils");
+var _utils5 = require("./utils");
 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 setExpandRef = exports.setExpandRef = function setExpandRef(ref) {
@@ -54,7 +55,7 @@ var deleteExpandAtPos = exports.deleteExpandAtPos = function deleteExpandAtPos(e
 };
 var deleteExpand = exports.deleteExpand = function deleteExpand(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    var expandNode = (0, _utils4.findExpand)(state);
+    var expandNode = (0, _utils5.findExpand)(state);
     if (!expandNode) {
       return false;
     }
@@ -107,7 +108,7 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
       // If we're going to collapse the expand and our cursor is currently inside
       // Move to a right gap cursor, if the toolbar is interacted (or an API),
       // it will insert below rather than inside (which will be invisible).
-      if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? isExpandedNext === true : isExpandedNext === false && (0, _utils4.findExpand)(state)) {
+      if (__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? isExpandedNext === true : isExpandedNext === false && (0, _utils5.findExpand)(state)) {
         tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection.Side.RIGHT));
       }
 
@@ -140,7 +141,7 @@ var createExpandNode = exports.createExpandNode = function createExpandNode(stat
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
   var isSelectionInTable = !!(0, _utils3.findTable)(state.selection);
-  var isSelectionInExpand = isNestingExpandsSupported && !!(0, _utils4.findExpand)(state, state.selection);
+  var isSelectionInExpand = isNestingExpandsSupported && (0, _utils4.isNestedInExpand)(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   return expandType.createAndFill({});
 };

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

@@ -76,7 +76,9 @@ function expandKeymap(api, options) {
     var selection = state.selection,
       schema = state.schema;
     var nodeBefore = selection.$from.nodeBefore;
-    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
+    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       var _$from = selection.$from;
       return (0, _commands.focusTitle)(Math.max(_$from.pos - 1, 0))(state, dispatch, editorView);
     }
@@ -100,7 +102,9 @@ function expandKeymap(api, options) {
       var expandBefore = (0, _utils2.findExpand)(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
-        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
+        if (
+        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+        (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
           return (0, _commands.focusTitle)(expandBefore.start)(state, dispatch, editorView);
         }
         // moving cursor from outside of an expand to the content when it is expanded
@@ -121,7 +125,9 @@ function expandKeymap(api, options) {
       nestedExpand = _state$schema$nodes.nestedExpand;
     var selection = state.selection;
     var nodeAfter = selection.$from.nodeAfter;
-    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
+    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       var $from = selection.$from;
       return (0, _commands.focusTitle)($from.pos + 1)(state, dispatch, editorView);
     }
@@ -151,7 +157,9 @@ 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, _utils2.findExpand)(state, sel);
-      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (
+      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+      (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
         return (0, _commands.focusTitle)(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/cjs/singlePlayerExpand/commands.js

@@ -12,10 +12,11 @@ var _expand = require("@atlaskit/editor-common/expand");
 var _selection = require("@atlaskit/editor-common/selection");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-common/utils");
-var _state = require("@atlaskit/editor-prosemirror/state");
+var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _utils4 = require("../utils");
 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; }
 // Creates either an expand or a nestedExpand node based on the current selection
@@ -26,7 +27,7 @@ var createExpandNode = exports.createExpandNode = function createExpandNode(stat
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
   var isSelectionInTable = !!(0, _utils3.findTable)(state.selection);
-  var isSelectionInExpand = isNestingExpandsSupported && !!(0, _transforms.findExpand)(state, state.selection);
+  var isSelectionInExpand = isNestingExpandsSupported && (0, _utils4.isNestedInExpand)(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   var expandNode = expandType.createAndFill({});
   if (setExpandedState) {
@@ -120,12 +121,12 @@ var deleteExpandAtPos = exports.deleteExpandAtPos = function deleteExpandAtPos(e
 
 // Used to clear any node or cell selection when expand title is focused
 var setSelectionInsideExpand = exports.setSelectionInsideExpand = function setSelectionInsideExpand(expandPos) {
-  return function (state, dispatch, editorView) {
+  return function (_state, dispatch, editorView) {
     if (editorView) {
       if (!editorView.hasFocus()) {
         editorView.focus();
       }
-      var sel = _state.Selection.findFrom(editorView.state.doc.resolve(expandPos), 1, true);
+      var sel = _state2.Selection.findFrom(editorView.state.doc.resolve(expandPos), 1, true);
       if (sel && dispatch) {
         dispatch(editorView.state.tr.setSelection(sel));
       }

package/dist/cjs/utils.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isNestedInExpand = 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);
+};

package/dist/es2019/legacyExpand/commands.js

@@ -6,6 +6,7 @@ import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { isNestedInExpand } from '../utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { findExpand } from './utils';
 export const setExpandRef = ref => createCommand({
@@ -129,7 +130,7 @@ export const createExpandNode = (state, isNestingExpandsSupported) => {
     nestedExpand
   } = state.schema.nodes;
   const isSelectionInTable = !!findTable(state.selection);
-  const isSelectionInExpand = isNestingExpandsSupported && !!findExpand(state, state.selection);
+  const isSelectionInExpand = isNestingExpandsSupported && isNestedInExpand(state);
   const expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   return expandType.createAndFill({});
 };

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

@@ -4,7 +4,7 @@ import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/utils';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, focusTitle } from '../commands';
 import { findExpand } from '../utils';
 const isExpandNode = node => {
@@ -84,7 +84,9 @@ export function expandKeymap(api, options) {
     const {
       nodeBefore
     } = selection.$from;
-    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       const {
         $from
       } = selection;
@@ -112,7 +114,9 @@ export function expandKeymap(api, options) {
       const expandBefore = findExpand(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
-        if (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
+        if (
+        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+        fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
           return focusTitle(expandBefore.start)(state, dispatch, editorView);
         }
         // moving cursor from outside of an expand to the content when it is expanded
@@ -138,7 +142,9 @@ export function expandKeymap(api, options) {
     const {
       nodeAfter
     } = selection.$from;
-    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       const {
         $from
       } = selection;
@@ -177,7 +183,9 @@ 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) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (
+      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+      fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/es2019/singlePlayerExpand/commands.js

@@ -8,6 +8,8 @@ import { Selection } 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';
+import { isNestedInExpand } from '../utils';
+
 // Creates either an expand or a nestedExpand node based on the current selection
 export const createExpandNode = (state, setExpandedState = true, isNestingExpandsSupported) => {
   const {
@@ -15,7 +17,7 @@ export const createExpandNode = (state, setExpandedState = true, isNestingExpand
     nestedExpand
   } = state.schema.nodes;
   const isSelectionInTable = !!findTable(state.selection);
-  const isSelectionInExpand = isNestingExpandsSupported && !!findExpand(state, state.selection);
+  const isSelectionInExpand = isNestingExpandsSupported && isNestedInExpand(state);
   const expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   const expandNode = expandType.createAndFill({});
   if (setExpandedState) {
@@ -98,7 +100,7 @@ export const deleteExpandAtPos = editorAnalyticsAPI => (expandNodePos, expandNod
 };
 
 // Used to clear any node or cell selection when expand title is focused
-export const setSelectionInsideExpand = expandPos => (state, dispatch, editorView) => {
+export const setSelectionInsideExpand = expandPos => (_state, dispatch, editorView) => {
   if (editorView) {
     if (!editorView.hasFocus()) {
       editorView.focus();

package/dist/es2019/utils.js

@@ -0,0 +1,2 @@
+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);

package/dist/esm/legacyExpand/commands.js

@@ -9,6 +9,7 @@ import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { isNestedInExpand } from '../utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { findExpand } from './utils';
 export var setExpandRef = function setExpandRef(ref) {
@@ -133,7 +134,7 @@ export var createExpandNode = function createExpandNode(state, isNestingExpandsS
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
   var isSelectionInTable = !!findTable(state.selection);
-  var isSelectionInExpand = isNestingExpandsSupported && !!findExpand(state, state.selection);
+  var isSelectionInExpand = isNestingExpandsSupported && isNestedInExpand(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   return expandType.createAndFill({});
 };

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

@@ -4,7 +4,7 @@ import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { isEmptyNode, isPositionNearTableRow } from '@atlaskit/editor-common/utils';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, focusTitle } from '../commands';
 import { findExpand } from '../utils';
 var isExpandNode = function isExpandNode(node) {
@@ -70,7 +70,9 @@ export function expandKeymap(api, options) {
     var selection = state.selection,
       schema = state.schema;
     var nodeBefore = selection.$from.nodeBefore;
-    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeBefore.attrs.__expanded : !nodeBefore.attrs.__expanded)) {
       var _$from = selection.$from;
       return focusTitle(Math.max(_$from.pos - 1, 0))(state, dispatch, editorView);
     }
@@ -94,7 +96,9 @@ export function expandKeymap(api, options) {
       var expandBefore = findExpand(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
-        if (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
+        if (
+        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+        fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded) {
           return focusTitle(expandBefore.start)(state, dispatch, editorView);
         }
         // moving cursor from outside of an expand to the content when it is expanded
@@ -115,7 +119,9 @@ export function expandKeymap(api, options) {
       nestedExpand = _state$schema$nodes.nestedExpand;
     var selection = state.selection;
     var nodeAfter = selection.$from.nodeAfter;
-    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
+    if (selection instanceof GapCursorSelection && selection.side === Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && (
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? nodeAfter.attrs.__expanded : !nodeAfter.attrs.__expanded)) {
       var $from = selection.$from;
       return focusTitle($from.pos + 1)(state, dispatch, editorView);
     }
@@ -145,7 +151,9 @@ 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) && (getBooleanFF('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
+      if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && (
+      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+      fg('platform.editor.live-pages-expand-divergence') && options.__livePage ? expandBefore.node.attrs.__expanded : !expandBefore.node.attrs.__expanded)) {
         return focusTitle(expandBefore.start)(state, dispatch, editorView);
       }
       return false;

package/dist/esm/singlePlayerExpand/commands.js

@@ -11,6 +11,8 @@ import { Selection } 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';
+import { isNestedInExpand } from '../utils';
+
 // Creates either an expand or a nestedExpand node based on the current selection
 export var createExpandNode = function createExpandNode(state) {
   var setExpandedState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
@@ -19,7 +21,7 @@ export var createExpandNode = function createExpandNode(state) {
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
   var isSelectionInTable = !!findTable(state.selection);
-  var isSelectionInExpand = isNestingExpandsSupported && !!findExpand(state, state.selection);
+  var isSelectionInExpand = isNestingExpandsSupported && isNestedInExpand(state);
   var expandType = isSelectionInTable || isSelectionInExpand ? nestedExpand : expand;
   var expandNode = expandType.createAndFill({});
   if (setExpandedState) {
@@ -113,7 +115,7 @@ export var deleteExpandAtPos = function deleteExpandAtPos(editorAnalyticsAPI) {
 
 // Used to clear any node or cell selection when expand title is focused
 export var setSelectionInsideExpand = function setSelectionInsideExpand(expandPos) {
-  return function (state, dispatch, editorView) {
+  return function (_state, dispatch, editorView) {
     if (editorView) {
       if (!editorView.hasFocus()) {
         editorView.focus();

package/dist/esm/utils.js

@@ -0,0 +1,6 @@
+import { hasParentNode } from '@atlaskit/editor-prosemirror/utils';
+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);
+};

package/dist/types/legacyExpand/commands.d.ts

@@ -2,7 +2,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { type InsertMethod } from '../types';
+import type { InsertMethod } from '../types';
 export declare const setExpandRef: (ref?: HTMLDivElement | null) => Command;
 export declare const deleteExpandAtPos: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (expandNodePos: number, expandNode: PMNode) => Command;
 export declare const deleteExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;

package/dist/types/singlePlayerExpand/commands.d.ts

@@ -2,7 +2,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { type InsertMethod } from '../types';
+import type { InsertMethod } from '../types';
 export declare const createExpandNode: (state: EditorState, setExpandedState?: boolean, isNestingExpandsSupported?: boolean) => PMNode | null;
 export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => (inputMethod: InsertMethod) => Command;
 export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => Command;

package/dist/types/utils.d.ts

@@ -0,0 +1,2 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const isNestedInExpand: (state: EditorState) => boolean;

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

@@ -2,7 +2,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { type InsertMethod } from '../types';
+import type { InsertMethod } from '../types';
 export declare const setExpandRef: (ref?: HTMLDivElement | null) => Command;
 export declare const deleteExpandAtPos: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (expandNodePos: number, expandNode: PMNode) => Command;
 export declare const deleteExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => Command;

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

@@ -2,7 +2,7 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { type InsertMethod } from '../types';
+import type { InsertMethod } from '../types';
 export declare const createExpandNode: (state: EditorState, setExpandedState?: boolean, isNestingExpandsSupported?: boolean) => PMNode | null;
 export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => (inputMethod: InsertMethod) => Command;
 export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, isNestingExpandsSupported?: boolean) => Command;

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

@@ -0,0 +1,2 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare const isNestedInExpand: (state: EditorState) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "2.5.0",
+	"version": "2.5.1",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",