@atlaskit/editor-plugin-expand 2.7.4 → 2.7.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-expand
 
+## 2.7.6
+
+### Patch Changes
+
+- [#144606](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/144606)
+  [`20ab1284d9880`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/20ab1284d9880) -
+  ED-24990 - Bugfix: cursor was going outside of parent expand and table cell when nested expand was
+  deleted.
+
+## 2.7.5
+
+### Patch Changes
+
+- [#143199](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/143199)
+  [`2c7282d335256`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2c7282d335256) -
+  [ux] [ED-24799] This change allows users to navigate using Tab when there are multiple expands on
+  the page. Previously, users could only navigate around the 1st expand on the page with Tab.
+- Updated dependencies
+
 ## 2.7.4
 
 ### Patch Changes

package/dist/cjs/legacyExpand/commands.js

@@ -15,6 +15,7 @@ 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 _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _utils4 = require("../utils");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 var _utils5 = require("./utils");
@@ -48,6 +49,14 @@ var deleteExpandAtPos = exports.deleteExpandAtPos = function deleteExpandAtPos(e
         var tr = state.tr;
         tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+        if ((0, _experiments.editorExperiment)('nested-expand-in-expand', true)) {
+          if (expandNode.type === state.schema.nodes.nestedExpand) {
+            var resolvedPos = tr.doc.resolve(expandNodePos + 1);
+            if (resolvedPos) {
+              tr.setSelection(_state2.Selection.near(resolvedPos, -1));
+            }
+          }
+        }
         dispatch(tr);
       }
       return true;
@@ -198,9 +207,11 @@ var focusTitle = exports.focusTitle = function focusTitle(pos) {
 };
 var focusIcon = exports.focusIcon = function focusIcon(expand) {
   return function (state, dispatch, editorView) {
-    if (!expand || !(expand instanceof HTMLElement)) {
+    if (!(expand instanceof HTMLElement)) {
       return false;
     }
+
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
     var iconContainer = expand.querySelector(".".concat(_styles.expandClassNames.iconContainer));
     if (iconContainer && iconContainer.focus) {
       var tr = state.tr;

package/dist/cjs/legacyExpand/nodeviews/index.js

@@ -28,7 +28,7 @@ function buildExpandClassName(type, expanded) {
 var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
   return ['div', {
     // prettier-ignore
-    'class': buildExpandClassName(node.type.name, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
+    'class': buildExpandClassName(node.type.name, __livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded),
     'data-node-type': node.type.name,
     'data-title': node.attrs.title
   }, ['div', {
@@ -52,11 +52,11 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
     value: node.attrs.title,
     placeholder: intl && intl.formatMessage(_ui.expandMessages.expandPlaceholderText) || _ui.expandMessages.expandPlaceholderText.defaultMessage,
     type: 'text',
-    readonly: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && titleReadOnly ? 'true' : undefined
+    readonly: titleReadOnly && (0, _platformFeatureFlags.fg)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') ? 'true' : undefined
   }]]], ['div', {
     // prettier-ignore
     class: _styles.expandClassNames.content,
-    contenteditable: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && contentEditable ? contentEditable ? 'true' : 'false' : undefined
+    contenteditable: contentEditable && (0, _platformFeatureFlags.fg)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };
 var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
@@ -267,7 +267,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       }
     });
     (0, _defineProperty2.default)(this, "isCollapsed", function () {
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && _this.__livePage) {
+      if (_this.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence')) {
         return _this.node.attrs.__expanded;
       }
       return !_this.node.attrs.__expanded;
@@ -397,8 +397,8 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       return;
     });
     (0, _defineProperty2.default)(this, "getContentEditable", function (node) {
-      var contentEditable = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && _this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && _this.api && _this.api.editorDisabled) {
+      var contentEditable = _this.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded;
+      if (_this.api && _this.api.editorDisabled && (0, _platformFeatureFlags.fg)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = _this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
       }
@@ -455,7 +455,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.icon.addEventListener('keydown', this.handleIconKeyDown);
       }
-      if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+      if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && (0, _platformFeatureFlags.fg)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
         this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
           var editorDisabled = sharedState.nextSharedState.editorDisabled;
           if (_this2.input) {
@@ -482,7 +482,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_ExpandIconButton.ExpandIconButton, {
         intl: intl,
         allowInteractiveExpand: this.allowInteractiveExpand,
-        expanded: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-pages-expand-divergence') && this.__livePage ? !__expanded : __expanded
+        expanded: this.__livePage && (0, _platformFeatureFlags.fg)('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
       }), this.icon);
     }
   }, {

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

@@ -9,9 +9,10 @@ var _selection = require("@atlaskit/editor-common/selection");
 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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../commands");
-var _utils2 = require("../utils");
+var _utils3 = require("../utils");
 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';
 };
@@ -49,20 +50,25 @@ function expandKeymap(api, options) {
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.tab.common, function (state, dispatch, editorView) {
     if (editorView && editorView.dom instanceof HTMLElement) {
       var from = state.selection.from;
+
+      // if the node selected is an expand
       if (isExpandSelected(state.selection)) {
         var expand = editorView.nodeDOM(from);
-        if (!expand || !(expand instanceof HTMLElement)) {
+        if (!expand) {
           return false;
         }
         return (0, _commands.focusIcon)(expand)(state, dispatch, editorView);
-      } else if (state.selection instanceof _state.TextSelection) {
-        var _dom$node$parentEleme;
-        var dom = editorView.domAtPos(from);
-        var _expand = (_dom$node$parentEleme = dom.node.parentElement) === null || _dom$node$parentEleme === void 0 ? void 0 : _dom$node$parentEleme.parentElement;
-        if (!_expand || !(_expand instanceof HTMLElement)) {
-          return false;
+      }
+
+      // if the text selection is inside an expand
+      else if (state.selection instanceof _state.TextSelection && !(0, _utils2.isInTable)(state)) {
+        var _expand = (0, _utils3.findExpand)(state);
+        if (_expand) {
+          var expandNode = editorView.nodeDOM(_expand.pos);
+          if (expandNode) {
+            return (0, _commands.focusIcon)(expandNode)(state, dispatch, editorView);
+          }
         }
-        return (0, _commands.focusIcon)(_expand)(state, dispatch, editorView);
       }
     }
     return false;
@@ -82,7 +88,7 @@ function expandKeymap(api, options) {
     }
     var $from = state.selection.$from;
     if (editorView.endOfTextblock('up')) {
-      var expand = (0, _utils2.findExpand)(state);
+      var expand = (0, _utils3.findExpand)(state);
 
       // Moving UP in a table should move the cursor to the row above
       // however when an expand is in a table cell to the left of the
@@ -97,7 +103,7 @@ function expandKeymap(api, options) {
         return (0, _commands.focusTitle)(expand.start)(state, dispatch, editorView);
       }
       var sel = _state.Selection.findFrom(state.doc.resolve(prevCursorPos), -1);
-      var expandBefore = (0, _utils2.findExpand)(state, sel);
+      var expandBefore = (0, _utils3.findExpand)(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
         if (
@@ -150,11 +156,11 @@ function expandKeymap(api, options) {
     var _state$schema$nodes2 = state.schema.nodes,
       expand = _state$schema$nodes2.expand,
       nestedExpand = _state$schema$nodes2.nestedExpand;
-    var expandNode = (0, _utils2.findExpand)(state);
+    var expandNode = (0, _utils3.findExpand)(state);
     if (!expandNode) {
       // @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);
+      var expandBefore = (0, _utils3.findExpand)(state, sel);
       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)) {

package/dist/cjs/singlePlayerExpand/commands.js

@@ -16,6 +16,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 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; }
@@ -105,6 +106,14 @@ var deleteExpandAtPos = exports.deleteExpandAtPos = function deleteExpandAtPos(e
         var tr = state.tr;
         tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+        if ((0, _experiments.editorExperiment)('nested-expand-in-expand', true)) {
+          if (expandNode.type === state.schema.nodes.nestedExpand) {
+            var resolvedPos = tr.doc.resolve(expandNodePos + 1);
+            if (resolvedPos) {
+              tr.setSelection(_state2.Selection.near(resolvedPos, -1));
+            }
+          }
+        }
         dispatch(tr);
       }
       return true;
@@ -200,9 +209,11 @@ var focusTitle = exports.focusTitle = function focusTitle(pos) {
 };
 var focusIcon = exports.focusIcon = function focusIcon(expand) {
   return function (state, dispatch, editorView) {
-    if (!expand || !(expand instanceof HTMLElement)) {
+    if (!(expand instanceof HTMLElement)) {
       return false;
     }
+
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
     var iconContainer = expand.querySelector(".".concat(_styles.expandClassNames.iconContainer));
     if (iconContainer && iconContainer.focus) {
       var tr = state.tr;

package/dist/cjs/singlePlayerExpand/node-views/index.js

@@ -354,7 +354,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     });
     (0, _defineProperty2.default)(this, "getContentEditable", function (node) {
       var contentEditable = !(0, _expand.isExpandCollapsed)(node);
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && _this.api && _this.api.editorDisabled) {
+      if (_this.api && _this.api.editorDisabled && (0, _platformFeatureFlags.fg)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = _this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
       }
@@ -398,7 +398,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     // Prevent ProseMirror from getting a focus event (causes weird selection issues).
     this.titleContainer.addEventListener('focus', this.handleFocus);
     this.icon.addEventListener('keydown', this.handleIconKeyDown);
-    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && (0, _platformFeatureFlags.fg)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
       this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
         var editorDisabled = sharedState.nextSharedState.editorDisabled;
         if (_this.input) {

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

@@ -11,6 +11,7 @@ var _transforms = require("@atlaskit/editor-common/transforms");
 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 _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';
@@ -49,20 +50,25 @@ function expandKeymap(api, options) {
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.tab.common, function (state, dispatch, editorView) {
     if (editorView && editorView.dom instanceof HTMLElement) {
       var from = state.selection.from;
+
+      // if the node selected is an expand
       if (isExpandSelected(state.selection)) {
         var expand = editorView.nodeDOM(from);
-        if (!expand || !(expand instanceof HTMLElement)) {
+        if (!expand) {
           return false;
         }
         return (0, _commands.focusIcon)(expand)(state, dispatch, editorView);
-      } else if (state.selection instanceof _state.TextSelection) {
-        var _dom$node$parentEleme;
-        var dom = editorView.domAtPos(from);
-        var _expand = (_dom$node$parentEleme = dom.node.parentElement) === null || _dom$node$parentEleme === void 0 ? void 0 : _dom$node$parentEleme.parentElement;
-        if (!_expand || !(_expand instanceof HTMLElement)) {
-          return false;
+      }
+
+      // if the text selection is inside an expand
+      else if (state.selection instanceof _state.TextSelection && !(0, _utils2.isInTable)(state)) {
+        var _expand = (0, _transforms.findExpand)(state);
+        if (_expand) {
+          var expandNode = editorView.nodeDOM(_expand.pos);
+          if (expandNode) {
+            return (0, _commands.focusIcon)(expandNode)(state, dispatch, editorView);
+          }
         }
-        return (0, _commands.focusIcon)(_expand)(state, dispatch, editorView);
       }
     }
     return false;

package/dist/es2019/legacyExpand/commands.js

@@ -7,6 +7,7 @@ import { Selection, TextSelection } 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isNestedInExpand } from '../utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { findExpand } from './utils';
@@ -34,6 +35,14 @@ export const deleteExpandAtPos = editorAnalyticsAPI => (expandNodePos, expandNod
     } = state;
     tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+    if (editorExperiment('nested-expand-in-expand', true)) {
+      if (expandNode.type === state.schema.nodes.nestedExpand) {
+        const resolvedPos = tr.doc.resolve(expandNodePos + 1);
+        if (resolvedPos) {
+          tr.setSelection(Selection.near(resolvedPos, -1));
+        }
+      }
+    }
     dispatch(tr);
   }
   return true;
@@ -178,9 +187,11 @@ export const focusTitle = pos => (state, dispatch, editorView) => {
   return false;
 };
 export const focusIcon = expand => (state, dispatch, editorView) => {
-  if (!expand || !(expand instanceof HTMLElement)) {
+  if (!(expand instanceof HTMLElement)) {
     return false;
   }
+
+  // eslint-disable-next-line @atlaskit/editor/no-as-casting
   const iconContainer = expand.querySelector(`.${expandClassNames.iconContainer}`);
   if (iconContainer && iconContainer.focus) {
     const {

package/dist/es2019/legacyExpand/nodeviews/index.js

@@ -9,7 +9,7 @@ import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpandAtPos, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandIconButton } from '../ui/ExpandIconButton';
 function buildExpandClassName(type, expanded) {
@@ -17,7 +17,7 @@ function buildExpandClassName(type, expanded) {
 }
 const toDOM = (node, __livePage, intl, titleReadOnly, contentEditable) => ['div', {
   // prettier-ignore
-  'class': buildExpandClassName(node.type.name, getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
+  'class': buildExpandClassName(node.type.name, __livePage && fg('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded),
   'data-node-type': node.type.name,
   'data-title': node.attrs.title
 }, ['div', {
@@ -41,11 +41,11 @@ const toDOM = (node, __livePage, intl, titleReadOnly, contentEditable) => ['div'
   value: node.attrs.title,
   placeholder: intl && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
   type: 'text',
-  readonly: getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && titleReadOnly ? 'true' : undefined
+  readonly: titleReadOnly && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') ? 'true' : undefined
 }]]], ['div', {
   // prettier-ignore
   class: expandClassNames.content,
-  contenteditable: getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && contentEditable ? contentEditable ? 'true' : 'false' : undefined
+  contenteditable: contentEditable && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') ? contentEditable ? 'true' : 'false' : undefined
 }, 0]];
 export class ExpandNodeView {
   constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange) {
@@ -258,7 +258,7 @@ export class ExpandNodeView {
       }
     });
     _defineProperty(this, "isCollapsed", () => {
-      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage) {
+      if (this.__livePage && fg('platform.editor.live-pages-expand-divergence')) {
         return this.node.attrs.__expanded;
       }
       return !this.node.attrs.__expanded;
@@ -398,8 +398,8 @@ export class ExpandNodeView {
       return;
     });
     _defineProperty(this, "getContentEditable", node => {
-      const contentEditable = getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
-      if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && this.api && this.api.editorDisabled) {
+      const contentEditable = this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded;
+      if (this.api && this.api.editorDisabled && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
       }
@@ -454,7 +454,7 @@ export class ExpandNodeView {
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
       this.icon.addEventListener('keydown', this.handleIconKeyDown);
     }
-    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
       this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(sharedState => {
         const editorDisabled = sharedState.nextSharedState.editorDisabled;
         if (this.input) {
@@ -480,7 +480,7 @@ export class ExpandNodeView {
     ReactDOM.render( /*#__PURE__*/React.createElement(ExpandIconButton, {
       intl: intl,
       allowInteractiveExpand: this.allowInteractiveExpand,
-      expanded: getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !__expanded : __expanded
+      expanded: this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
     }), this.icon);
   }
   stopEvent(event) {

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

@@ -3,6 +3,7 @@ import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor
 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 { isInTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 import { findExpand } from '../utils';
@@ -51,20 +52,25 @@ export function expandKeymap(api, options) {
       const {
         from
       } = state.selection;
+
+      // if the node selected is an expand
       if (isExpandSelected(state.selection)) {
         const expand = editorView.nodeDOM(from);
-        if (!expand || !(expand instanceof HTMLElement)) {
+        if (!expand) {
           return false;
         }
         return focusIcon(expand)(state, dispatch, editorView);
-      } else if (state.selection instanceof TextSelection) {
-        var _dom$node$parentEleme;
-        const dom = editorView.domAtPos(from);
-        const expand = (_dom$node$parentEleme = dom.node.parentElement) === null || _dom$node$parentEleme === void 0 ? void 0 : _dom$node$parentEleme.parentElement;
-        if (!expand || !(expand instanceof HTMLElement)) {
-          return false;
+      }
+
+      // if the text selection is inside an expand
+      else if (state.selection instanceof TextSelection && !isInTable(state)) {
+        const expand = findExpand(state);
+        if (expand) {
+          const expandNode = editorView.nodeDOM(expand.pos);
+          if (expandNode) {
+            return focusIcon(expandNode)(state, dispatch, editorView);
+          }
         }
-        return focusIcon(expand)(state, dispatch, editorView);
       }
     }
     return false;

package/dist/es2019/singlePlayerExpand/commands.js

@@ -8,6 +8,7 @@ import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isNestedInExpand } from '../utils';
 
 // Creates either an expand or a nestedExpand node based on the current selection
@@ -87,6 +88,14 @@ export const deleteExpandAtPos = editorAnalyticsAPI => (expandNodePos, expandNod
     } = state;
     tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+    if (editorExperiment('nested-expand-in-expand', true)) {
+      if (expandNode.type === state.schema.nodes.nestedExpand) {
+        const resolvedPos = tr.doc.resolve(expandNodePos + 1);
+        if (resolvedPos) {
+          tr.setSelection(Selection.near(resolvedPos, -1));
+        }
+      }
+    }
     dispatch(tr);
   }
   return true;
@@ -178,9 +187,11 @@ export const focusTitle = pos => (state, dispatch, editorView) => {
   return false;
 };
 export const focusIcon = expand => (state, dispatch, editorView) => {
-  if (!expand || !(expand instanceof HTMLElement)) {
+  if (!(expand instanceof HTMLElement)) {
     return false;
   }
+
+  // eslint-disable-next-line @atlaskit/editor/no-as-casting
   const iconContainer = expand.querySelector(`.${expandClassNames.iconContainer}`);
   if (iconContainer && iconContainer.focus) {
     const {

package/dist/es2019/singlePlayerExpand/node-views/index.js

@@ -8,7 +8,7 @@ import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { buildExpandClassName, renderIcon, toDOM } from '../ui/NodeView';
 export class ExpandNodeView {
@@ -355,7 +355,7 @@ export class ExpandNodeView {
     });
     _defineProperty(this, "getContentEditable", node => {
       const contentEditable = !isExpandCollapsed(node);
-      if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && this.api && this.api.editorDisabled) {
+      if (this.api && this.api.editorDisabled && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
       }
@@ -400,7 +400,7 @@ export class ExpandNodeView {
     // Prevent ProseMirror from getting a focus event (causes weird selection issues).
     this.titleContainer.addEventListener('focus', this.handleFocus);
     this.icon.addEventListener('keydown', this.handleIconKeyDown);
-    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
       this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(sharedState => {
         const editorDisabled = sharedState.nextSharedState.editorDisabled;
         if (this.input) {

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

@@ -5,6 +5,7 @@ import { findExpand } from '@atlaskit/editor-common/transforms';
 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 { isInTable } from '@atlaskit/editor-tables/utils';
 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';
@@ -51,20 +52,25 @@ export function expandKeymap(api, options) {
       const {
         from
       } = state.selection;
+
+      // if the node selected is an expand
       if (isExpandSelected(state.selection)) {
         const expand = editorView.nodeDOM(from);
-        if (!expand || !(expand instanceof HTMLElement)) {
+        if (!expand) {
           return false;
         }
         return focusIcon(expand)(state, dispatch, editorView);
-      } else if (state.selection instanceof TextSelection) {
-        var _dom$node$parentEleme;
-        const dom = editorView.domAtPos(from);
-        const expand = (_dom$node$parentEleme = dom.node.parentElement) === null || _dom$node$parentEleme === void 0 ? void 0 : _dom$node$parentEleme.parentElement;
-        if (!expand || !(expand instanceof HTMLElement)) {
-          return false;
+      }
+
+      // if the text selection is inside an expand
+      else if (state.selection instanceof TextSelection && !isInTable(state)) {
+        const expand = findExpand(state);
+        if (expand) {
+          const expandNode = editorView.nodeDOM(expand.pos);
+          if (expandNode) {
+            return focusIcon(expandNode)(state, dispatch, editorView);
+          }
         }
-        return focusIcon(expand)(state, dispatch, editorView);
       }
     }
     return false;

package/dist/esm/legacyExpand/commands.js

@@ -10,6 +10,7 @@ import { Selection, TextSelection } 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isNestedInExpand } from '../utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { findExpand } from './utils';
@@ -41,6 +42,14 @@ export var deleteExpandAtPos = function deleteExpandAtPos(editorAnalyticsAPI) {
         var tr = state.tr;
         tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+        if (editorExperiment('nested-expand-in-expand', true)) {
+          if (expandNode.type === state.schema.nodes.nestedExpand) {
+            var resolvedPos = tr.doc.resolve(expandNodePos + 1);
+            if (resolvedPos) {
+              tr.setSelection(Selection.near(resolvedPos, -1));
+            }
+          }
+        }
         dispatch(tr);
       }
       return true;
@@ -191,9 +200,11 @@ export var focusTitle = function focusTitle(pos) {
 };
 export var focusIcon = function focusIcon(expand) {
   return function (state, dispatch, editorView) {
-    if (!expand || !(expand instanceof HTMLElement)) {
+    if (!(expand instanceof HTMLElement)) {
       return false;
     }
+
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
     var iconContainer = expand.querySelector(".".concat(expandClassNames.iconContainer));
     if (iconContainer && iconContainer.focus) {
       var tr = state.tr;

package/dist/esm/legacyExpand/nodeviews/index.js

@@ -11,7 +11,7 @@ import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpandAtPos, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandIconButton } from '../ui/ExpandIconButton';
 function buildExpandClassName(type, expanded) {
@@ -20,7 +20,7 @@ function buildExpandClassName(type, expanded) {
 var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditable) {
   return ['div', {
     // prettier-ignore
-    'class': buildExpandClassName(node.type.name, getBooleanFF('platform.editor.live-pages-expand-divergence') && __livePage ? !node.attrs.__expanded : node.attrs.__expanded),
+    'class': buildExpandClassName(node.type.name, __livePage && fg('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded),
     'data-node-type': node.type.name,
     'data-title': node.attrs.title
   }, ['div', {
@@ -44,11 +44,11 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
     value: node.attrs.title,
     placeholder: intl && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
     type: 'text',
-    readonly: getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && titleReadOnly ? 'true' : undefined
+    readonly: titleReadOnly && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') ? 'true' : undefined
   }]]], ['div', {
     // prettier-ignore
     class: expandClassNames.content,
-    contenteditable: getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && contentEditable ? contentEditable ? 'true' : 'false' : undefined
+    contenteditable: contentEditable && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };
 export var ExpandNodeView = /*#__PURE__*/function () {
@@ -259,7 +259,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       }
     });
     _defineProperty(this, "isCollapsed", function () {
-      if (getBooleanFF('platform.editor.live-pages-expand-divergence') && _this.__livePage) {
+      if (_this.__livePage && fg('platform.editor.live-pages-expand-divergence')) {
         return _this.node.attrs.__expanded;
       }
       return !_this.node.attrs.__expanded;
@@ -389,8 +389,8 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       return;
     });
     _defineProperty(this, "getContentEditable", function (node) {
-      var contentEditable = getBooleanFF('platform.editor.live-pages-expand-divergence') && _this.__livePage ? !node.attrs.__expanded : node.attrs.__expanded;
-      if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && _this.api && _this.api.editorDisabled) {
+      var contentEditable = _this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !node.attrs.__expanded : node.attrs.__expanded;
+      if (_this.api && _this.api.editorDisabled && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = _this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
       }
@@ -447,7 +447,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
         this.icon.addEventListener('keydown', this.handleIconKeyDown);
       }
-      if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+      if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
         this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
           var editorDisabled = sharedState.nextSharedState.editorDisabled;
           if (_this2.input) {
@@ -474,7 +474,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       ReactDOM.render( /*#__PURE__*/React.createElement(ExpandIconButton, {
         intl: intl,
         allowInteractiveExpand: this.allowInteractiveExpand,
-        expanded: getBooleanFF('platform.editor.live-pages-expand-divergence') && this.__livePage ? !__expanded : __expanded
+        expanded: this.__livePage && fg('platform.editor.live-pages-expand-divergence') ? !__expanded : __expanded
       }), this.icon);
     }
   }, {

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

@@ -3,6 +3,7 @@ import { GapCursorSelection, RelativeSelectionPos, Side } from '@atlaskit/editor
 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 { isInTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, focusIcon, focusTitle } from '../commands';
 import { findExpand } from '../utils';
@@ -43,20 +44,25 @@ export function expandKeymap(api, options) {
   bindKeymapWithCommand(tab.common, function (state, dispatch, editorView) {
     if (editorView && editorView.dom instanceof HTMLElement) {
       var from = state.selection.from;
+
+      // if the node selected is an expand
       if (isExpandSelected(state.selection)) {
         var expand = editorView.nodeDOM(from);
-        if (!expand || !(expand instanceof HTMLElement)) {
+        if (!expand) {
           return false;
         }
         return focusIcon(expand)(state, dispatch, editorView);
-      } else if (state.selection instanceof TextSelection) {
-        var _dom$node$parentEleme;
-        var dom = editorView.domAtPos(from);
-        var _expand = (_dom$node$parentEleme = dom.node.parentElement) === null || _dom$node$parentEleme === void 0 ? void 0 : _dom$node$parentEleme.parentElement;
-        if (!_expand || !(_expand instanceof HTMLElement)) {
-          return false;
+      }
+
+      // if the text selection is inside an expand
+      else if (state.selection instanceof TextSelection && !isInTable(state)) {
+        var _expand = findExpand(state);
+        if (_expand) {
+          var expandNode = editorView.nodeDOM(_expand.pos);
+          if (expandNode) {
+            return focusIcon(expandNode)(state, dispatch, editorView);
+          }
         }
-        return focusIcon(_expand)(state, dispatch, editorView);
       }
     }
     return false;

package/dist/esm/singlePlayerExpand/commands.js

@@ -11,6 +11,7 @@ import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isNestedInExpand } from '../utils';
 
 // Creates either an expand or a nestedExpand node based on the current selection
@@ -99,6 +100,14 @@ export var deleteExpandAtPos = function deleteExpandAtPos(editorAnalyticsAPI) {
         var tr = state.tr;
         tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
+        if (editorExperiment('nested-expand-in-expand', true)) {
+          if (expandNode.type === state.schema.nodes.nestedExpand) {
+            var resolvedPos = tr.doc.resolve(expandNodePos + 1);
+            if (resolvedPos) {
+              tr.setSelection(Selection.near(resolvedPos, -1));
+            }
+          }
+        }
         dispatch(tr);
       }
       return true;
@@ -194,9 +203,11 @@ export var focusTitle = function focusTitle(pos) {
 };
 export var focusIcon = function focusIcon(expand) {
   return function (state, dispatch, editorView) {
-    if (!expand || !(expand instanceof HTMLElement)) {
+    if (!(expand instanceof HTMLElement)) {
       return false;
     }
+
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
     var iconContainer = expand.querySelector(".".concat(expandClassNames.iconContainer));
     if (iconContainer && iconContainer.focus) {
       var tr = state.tr;

package/dist/esm/singlePlayerExpand/node-views/index.js

@@ -10,7 +10,7 @@ import { closestElement, isEmptyNode } from '@atlaskit/editor-common/utils';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { buildExpandClassName, renderIcon, toDOM } from '../ui/NodeView';
 export var ExpandNodeView = /*#__PURE__*/function () {
@@ -346,7 +346,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     });
     _defineProperty(this, "getContentEditable", function (node) {
       var contentEditable = !isExpandCollapsed(node);
-      if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx') && _this.api && _this.api.editorDisabled) {
+      if (_this.api && _this.api.editorDisabled && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
         var _this$api$editorDisab;
         return !((_this$api$editorDisab = _this.api.editorDisabled.sharedState.currentState()) !== null && _this$api$editorDisab !== void 0 && _this$api$editorDisab.editorDisabled) && contentEditable;
       }
@@ -390,7 +390,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     // Prevent ProseMirror from getting a focus event (causes weird selection issues).
     this.titleContainer.addEventListener('focus', this.handleFocus);
     this.icon.addEventListener('keydown', this.handleIconKeyDown);
-    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+    if ((_this$api6 = this.api) !== null && _this$api6 !== void 0 && _this$api6.editorDisabled && fg('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
       this.cleanUpEditorDisabledOnChange = this.api.editorDisabled.sharedState.onChange(function (sharedState) {
         var editorDisabled = sharedState.nextSharedState.editorDisabled;
         if (_this.input) {

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

@@ -5,6 +5,7 @@ import { findExpand } from '@atlaskit/editor-common/transforms';
 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 { isInTable } from '@atlaskit/editor-tables/utils';
 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';
@@ -43,20 +44,25 @@ export function expandKeymap(api, options) {
   bindKeymapWithCommand(tab.common, function (state, dispatch, editorView) {
     if (editorView && editorView.dom instanceof HTMLElement) {
       var from = state.selection.from;
+
+      // if the node selected is an expand
       if (isExpandSelected(state.selection)) {
         var expand = editorView.nodeDOM(from);
-        if (!expand || !(expand instanceof HTMLElement)) {
+        if (!expand) {
           return false;
         }
         return focusIcon(expand)(state, dispatch, editorView);
-      } else if (state.selection instanceof TextSelection) {
-        var _dom$node$parentEleme;
-        var dom = editorView.domAtPos(from);
-        var _expand = (_dom$node$parentEleme = dom.node.parentElement) === null || _dom$node$parentEleme === void 0 ? void 0 : _dom$node$parentEleme.parentElement;
-        if (!_expand || !(_expand instanceof HTMLElement)) {
-          return false;
+      }
+
+      // if the text selection is inside an expand
+      else if (state.selection instanceof TextSelection && !isInTable(state)) {
+        var _expand = findExpand(state);
+        if (_expand) {
+          var expandNode = editorView.nodeDOM(_expand.pos);
+          if (expandNode) {
+            return focusIcon(expandNode)(state, dispatch, editorView);
+          }
         }
-        return focusIcon(_expand)(state, dispatch, editorView);
       }
     }
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "2.7.4",
+	"version": "2.7.6",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,8 +32,8 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/button": "^20.1.0",
-		"@atlaskit/editor-common": "^90.1.0",
+		"@atlaskit/button": "^20.2.0",
+		"@atlaskit/editor-common": "^91.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -60,7 +60,7 @@
 		"@atlaskit/editor-plugin-content-insertion": "^1.8.0",
 		"@atlaskit/editor-plugin-guideline": "^1.2.0",
 		"@atlaskit/editor-plugin-quick-insert": "^1.4.0",
-		"@atlaskit/editor-plugin-table": "^7.27.0",
+		"@atlaskit/editor-plugin-table": "^7.28.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.8.0",
 		"@atlaskit/editor-plugin-width": "^1.3.0",
 		"@testing-library/react": "^12.1.5",