@atlaskit/editor-plugin-expand 8.4.3 → 8.5.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-expand
 
+## 8.5.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.5.0
+
+### Minor Changes
+
+- [`00ae34886b5f7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/00ae34886b5f7) -
+  [EDITOR-5796](https://hello.jira.atlassian.cloud/browse/EDITOR-5796) - clean up
+  platform_editor_display_none_to_expand experiment
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.4.3
 
 ### Patch Changes

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

@@ -63,8 +63,7 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
     readonly: titleReadOnly ? 'true' : undefined
   }]]], ['div', {
     // prettier-ignore
-    class: _styles.expandClassNames.content,
-    style: (0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true) ? "display: ".concat(__livePage ? !node.attrs.__expanded : node.attrs.__expanded ? 'flow-root' : 'none') : undefined,
+    class: "".concat(_styles.expandClassNames.content, " ").concat((__livePage ? !node.attrs.__expanded : node.attrs.__expanded) ? '' : _styles.expandClassNames.contentCollapsed),
     contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };
@@ -537,9 +536,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           if (_this2.content) {
             _this2.content.setAttribute('contenteditable', _this2.getContentEditable(_this2.node) ? 'true' : 'false');
           }
-          if ((0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-            _this2.updateDisplayStyle(_this2.node);
-          }
+          _this2.updateDisplayStyle(_this2.node);
         });
       }
     }
@@ -578,7 +575,11 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     value: function updateDisplayStyle(node) {
       if (this.content) {
         var isCollapsed = this.__livePage ? node.attrs.__expanded : !node.attrs.__expanded;
-        this.content.style.display = isCollapsed ? 'none' : 'flow-root';
+        if (isCollapsed) {
+          this.content.classList.add(_styles.expandClassNames.contentCollapsed);
+        } else {
+          this.content.classList.remove(_styles.expandClassNames.contentCollapsed);
+        }
       }
     }
   }, {
@@ -622,9 +623,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
             // Disallow interaction/selection inside when collapsed.
             this.content.setAttribute('contenteditable', this.getContentEditable(node) ? 'true' : 'false');
           }
-          if ((0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-            this.updateDisplayStyle(node);
-          }
+          this.updateDisplayStyle(node);
         }
 
         // During a collab session the title doesn't sync with other users

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

@@ -100,9 +100,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           node: _this.node
         })(_this.view.state, _this.view.dispatch);
         _this.updateExpandToggleIcon(_this.node);
-        if ((0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-          _this.updateDisplayStyle(_this.node);
-        }
+        _this.updateDisplayStyle(_this.node);
         return;
       }
       if (target === _this.input) {
@@ -221,9 +219,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           node: _this.node
         })(state, dispatch);
         _this.updateExpandToggleIcon(_this.node);
-        if ((0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-          _this.updateDisplayStyle(_this.node);
-        }
+        _this.updateDisplayStyle(_this.node);
       }
     });
     (0, _defineProperty2.default)(this, "moveToOutsideOfTitle", function (event) {
@@ -559,9 +555,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
           var hasChanged = (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3') ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
           if (hasChanged) {
             this.updateExpandToggleIcon(node);
-            if ((0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-              this.updateDisplayStyle(node);
-            }
+            this.updateDisplayStyle(node);
           }
         } else {
           this.node = node;
@@ -607,7 +601,11 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     key: "updateDisplayStyle",
     value: function updateDisplayStyle(node) {
       if (this.content) {
-        this.content.style.display = (0, _expand.isExpandCollapsed)(node) ? 'none' : 'flow-root';
+        if ((0, _expand.isExpandCollapsed)(node)) {
+          this.content.classList.add(_styles.expandClassNames.contentCollapsed);
+        } else {
+          this.content.classList.remove(_styles.expandClassNames.contentCollapsed);
+        }
       }
     }
   }, {

package/dist/cjs/singlePlayerExpand/ui/NodeView.js

@@ -10,7 +10,6 @@ var _expand = require("@atlaskit/editor-common/expand");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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 buildExpandClassName = exports.buildExpandClassName = function buildExpandClassName(type, expanded) {
@@ -51,8 +50,7 @@ var toDOM = exports.toDOM = function toDOM(node, __livePage, intl, titleReadOnly
     readonly: titleReadOnly ? 'true' : undefined
   }]]], ['div', {
     // prettier-ignore
-    class: _styles.expandClassNames.content,
-    style: (0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true) ? "display: ".concat(_expand.expandedState.get(node) ? 'flow-root' : 'none') : undefined,
+    class: "".concat(_styles.expandClassNames.content, " ").concat(_expand.expandedState.get(node) ? '' : _styles.expandClassNames.contentCollapsed),
     contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };

package/dist/cjs/singlePlayerExpand/utils.js

@@ -6,23 +6,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.findSelectedParentExpandNode = exports.findReplaceExpandDecorations = void 0;
 var _expand = require("@atlaskit/editor-common/expand");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 // from platform/packages/editor/editor-plugin-find-replace/src/ui/styles.ts
 var darkModeSearchMatchClass = 'search-match-dark';
 var searchMatchExpandTitleClass = 'search-match-expand-title';
 var selectedSearchMatchClass = 'selected-search-match';
 var findSelectedParentExpandNode = exports.findSelectedParentExpandNode = function findSelectedParentExpandNode(state) {
   var nestedOrParentExpand = (0, _utils.findParentNodeOfType)(state.schema.nodes.nestedExpand)(state.selection) || (0, _utils.findParentNodeOfType)(state.schema.nodes.expand)(state.selection);
-  if ((0, _expValEquals.expValEquals)('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-    // If it's nested expand, we should check if its parent expand is collapsed.
-    // If the parent expand is collapsed, the nested expand is not visible,
-    // so it could not be selected.
-    // In this case, we return the parent expand node instead of the nested expand node.
-    if ((nestedOrParentExpand === null || nestedOrParentExpand === void 0 ? void 0 : nestedOrParentExpand.node.type) === state.schema.nodes.nestedExpand) {
-      var parentExpand = (0, _utils.findParentNodeOfType)(state.schema.nodes.expand)(state.selection);
-      if (parentExpand && (0, _expand.isExpandCollapsed)(parentExpand.node)) {
-        return parentExpand;
-      }
+
+  // If it's nested expand, we should check if its parent expand is collapsed.
+  // If the parent expand is collapsed, the nested expand is not visible,
+  // so it could not be selected.
+  // In this case, we return the parent expand node instead of the nested expand node.
+  if ((nestedOrParentExpand === null || nestedOrParentExpand === void 0 ? void 0 : nestedOrParentExpand.node.type) === state.schema.nodes.nestedExpand) {
+    var parentExpand = (0, _utils.findParentNodeOfType)(state.schema.nodes.expand)(state.selection);
+    if (parentExpand && (0, _expand.isExpandCollapsed)(parentExpand.node)) {
+      return parentExpand;
     }
   }
   return nestedOrParentExpand;

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

@@ -52,8 +52,7 @@ const toDOM = (node, __livePage, intl, titleReadOnly, contentEditable) => ['div'
   readonly: titleReadOnly ? 'true' : undefined
 }]]], ['div', {
   // prettier-ignore
-  class: expandClassNames.content,
-  style: expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true) ? `display: ${__livePage ? !node.attrs.__expanded : node.attrs.__expanded ? 'flow-root' : 'none'}` : undefined,
+  class: `${expandClassNames.content} ${(__livePage ? !node.attrs.__expanded : node.attrs.__expanded) ? '' : expandClassNames.contentCollapsed}`,
   contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
 }, 0]];
 export class ExpandNodeView {
@@ -538,9 +537,7 @@ export class ExpandNodeView {
         if (this.content) {
           this.content.setAttribute('contenteditable', this.getContentEditable(this.node) ? 'true' : 'false');
         }
-        if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-          this.updateDisplayStyle(this.node);
-        }
+        this.updateDisplayStyle(this.node);
       });
     }
   }
@@ -573,7 +570,11 @@ export class ExpandNodeView {
   updateDisplayStyle(node) {
     if (this.content) {
       const isCollapsed = this.__livePage ? node.attrs.__expanded : !node.attrs.__expanded;
-      this.content.style.display = isCollapsed ? 'none' : 'flow-root';
+      if (isCollapsed) {
+        this.content.classList.add(expandClassNames.contentCollapsed);
+      } else {
+        this.content.classList.remove(expandClassNames.contentCollapsed);
+      }
     }
   }
   stopEvent(event) {
@@ -610,9 +611,7 @@ export class ExpandNodeView {
           // Disallow interaction/selection inside when collapsed.
           this.content.setAttribute('contenteditable', this.getContentEditable(node) ? 'true' : 'false');
         }
-        if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-          this.updateDisplayStyle(node);
-        }
+        this.updateDisplayStyle(node);
       }
 
       // During a collab session the title doesn't sync with other users

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

@@ -84,9 +84,7 @@ export class ExpandNodeView {
           node: this.node
         })(this.view.state, this.view.dispatch);
         this.updateExpandToggleIcon(this.node);
-        if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-          this.updateDisplayStyle(this.node);
-        }
+        this.updateDisplayStyle(this.node);
         return;
       }
       if (target === this.input) {
@@ -210,9 +208,7 @@ export class ExpandNodeView {
           node: this.node
         })(state, dispatch);
         this.updateExpandToggleIcon(this.node);
-        if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-          this.updateDisplayStyle(this.node);
-        }
+        this.updateDisplayStyle(this.node);
       }
     });
     _defineProperty(this, "moveToOutsideOfTitle", event => {
@@ -553,9 +549,7 @@ export class ExpandNodeView {
         const hasChanged = expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_v2_patch_3') ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
         if (hasChanged) {
           this.updateExpandToggleIcon(node);
-          if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-            this.updateDisplayStyle(node);
-          }
+          this.updateDisplayStyle(node);
         }
       } else {
         this.node = node;
@@ -595,7 +589,11 @@ export class ExpandNodeView {
   }
   updateDisplayStyle(node) {
     if (this.content) {
-      this.content.style.display = isExpandCollapsed(node) ? 'none' : 'flow-root';
+      if (isExpandCollapsed(node)) {
+        this.content.classList.add(expandClassNames.contentCollapsed);
+      } else {
+        this.content.classList.remove(expandClassNames.contentCollapsed);
+      }
     }
   }
   updateExpandBodyContentEditable() {

package/dist/es2019/singlePlayerExpand/ui/NodeView.js

@@ -2,7 +2,6 @@ import { expandedState } from '@atlaskit/editor-common/expand';
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { expandMessages } from '@atlaskit/editor-common/ui';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const buildExpandClassName = (type, expanded) => {
   return `${expandClassNames.prefix} ${expandClassNames.type(type)} ${expanded ? expandClassNames.expanded : ''}`;
 };
@@ -42,8 +41,7 @@ export const toDOM = (node, __livePage, intl, titleReadOnly, contentEditable) =>
     readonly: titleReadOnly ? 'true' : undefined
   }]]], ['div', {
     // prettier-ignore
-    class: expandClassNames.content,
-    style: expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true) ? `display: ${expandedState.get(node) ? 'flow-root' : 'none'}` : undefined,
+    class: `${expandClassNames.content} ${expandedState.get(node) ? '' : expandClassNames.contentCollapsed}`,
     contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };

package/dist/es2019/singlePlayerExpand/utils.js

@@ -1,6 +1,5 @@
 import { isExpandCollapsed } from '@atlaskit/editor-common/expand';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 // from platform/packages/editor/editor-plugin-find-replace/src/ui/styles.ts
 const darkModeSearchMatchClass = 'search-match-dark';
@@ -8,16 +7,15 @@ const searchMatchExpandTitleClass = 'search-match-expand-title';
 const selectedSearchMatchClass = 'selected-search-match';
 export const findSelectedParentExpandNode = state => {
   const nestedOrParentExpand = findParentNodeOfType(state.schema.nodes.nestedExpand)(state.selection) || findParentNodeOfType(state.schema.nodes.expand)(state.selection);
-  if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-    // If it's nested expand, we should check if its parent expand is collapsed.
-    // If the parent expand is collapsed, the nested expand is not visible,
-    // so it could not be selected.
-    // In this case, we return the parent expand node instead of the nested expand node.
-    if ((nestedOrParentExpand === null || nestedOrParentExpand === void 0 ? void 0 : nestedOrParentExpand.node.type) === state.schema.nodes.nestedExpand) {
-      const parentExpand = findParentNodeOfType(state.schema.nodes.expand)(state.selection);
-      if (parentExpand && isExpandCollapsed(parentExpand.node)) {
-        return parentExpand;
-      }
+
+  // If it's nested expand, we should check if its parent expand is collapsed.
+  // If the parent expand is collapsed, the nested expand is not visible,
+  // so it could not be selected.
+  // In this case, we return the parent expand node instead of the nested expand node.
+  if ((nestedOrParentExpand === null || nestedOrParentExpand === void 0 ? void 0 : nestedOrParentExpand.node.type) === state.schema.nodes.nestedExpand) {
+    const parentExpand = findParentNodeOfType(state.schema.nodes.expand)(state.selection);
+    if (parentExpand && isExpandCollapsed(parentExpand.node)) {
+      return parentExpand;
     }
   }
   return nestedOrParentExpand;

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

@@ -56,8 +56,7 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
     readonly: titleReadOnly ? 'true' : undefined
   }]]], ['div', {
     // prettier-ignore
-    class: expandClassNames.content,
-    style: expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true) ? "display: ".concat(__livePage ? !node.attrs.__expanded : node.attrs.__expanded ? 'flow-root' : 'none') : undefined,
+    class: "".concat(expandClassNames.content, " ").concat((__livePage ? !node.attrs.__expanded : node.attrs.__expanded) ? '' : expandClassNames.contentCollapsed),
     contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };
@@ -530,9 +529,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           if (_this2.content) {
             _this2.content.setAttribute('contenteditable', _this2.getContentEditable(_this2.node) ? 'true' : 'false');
           }
-          if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-            _this2.updateDisplayStyle(_this2.node);
-          }
+          _this2.updateDisplayStyle(_this2.node);
         });
       }
     }
@@ -571,7 +568,11 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     value: function updateDisplayStyle(node) {
       if (this.content) {
         var isCollapsed = this.__livePage ? node.attrs.__expanded : !node.attrs.__expanded;
-        this.content.style.display = isCollapsed ? 'none' : 'flow-root';
+        if (isCollapsed) {
+          this.content.classList.add(expandClassNames.contentCollapsed);
+        } else {
+          this.content.classList.remove(expandClassNames.contentCollapsed);
+        }
       }
     }
   }, {
@@ -615,9 +616,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
             // Disallow interaction/selection inside when collapsed.
             this.content.setAttribute('contenteditable', this.getContentEditable(node) ? 'true' : 'false');
           }
-          if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-            this.updateDisplayStyle(node);
-          }
+          this.updateDisplayStyle(node);
         }
 
         // During a collab session the title doesn't sync with other users

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

@@ -92,9 +92,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           node: _this.node
         })(_this.view.state, _this.view.dispatch);
         _this.updateExpandToggleIcon(_this.node);
-        if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-          _this.updateDisplayStyle(_this.node);
-        }
+        _this.updateDisplayStyle(_this.node);
         return;
       }
       if (target === _this.input) {
@@ -213,9 +211,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           node: _this.node
         })(state, dispatch);
         _this.updateExpandToggleIcon(_this.node);
-        if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-          _this.updateDisplayStyle(_this.node);
-        }
+        _this.updateDisplayStyle(_this.node);
       }
     });
     _defineProperty(this, "moveToOutsideOfTitle", function (event) {
@@ -551,9 +547,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
           var hasChanged = expValEquals('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_v2_patch_3') ? this.isExpanded.expanded !== currentExpanded && this.isExpanded.localId === node.attrs.localId : this.isExpanded.expanded !== currentExpanded;
           if (hasChanged) {
             this.updateExpandToggleIcon(node);
-            if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-              this.updateDisplayStyle(node);
-            }
+            this.updateDisplayStyle(node);
           }
         } else {
           this.node = node;
@@ -599,7 +593,11 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     key: "updateDisplayStyle",
     value: function updateDisplayStyle(node) {
       if (this.content) {
-        this.content.style.display = isExpandCollapsed(node) ? 'none' : 'flow-root';
+        if (isExpandCollapsed(node)) {
+          this.content.classList.add(expandClassNames.contentCollapsed);
+        } else {
+          this.content.classList.remove(expandClassNames.contentCollapsed);
+        }
       }
     }
   }, {

package/dist/esm/singlePlayerExpand/ui/NodeView.js

@@ -5,7 +5,6 @@ import { expandedState } from '@atlaskit/editor-common/expand';
 import { expandClassNames } from '@atlaskit/editor-common/styles';
 import { expandMessages } from '@atlaskit/editor-common/ui';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export var buildExpandClassName = function buildExpandClassName(type, expanded) {
   return "".concat(expandClassNames.prefix, " ").concat(expandClassNames.type(type), " ").concat(expanded ? expandClassNames.expanded : '');
 };
@@ -44,8 +43,7 @@ export var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, content
     readonly: titleReadOnly ? 'true' : undefined
   }]]], ['div', {
     // prettier-ignore
-    class: expandClassNames.content,
-    style: expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true) ? "display: ".concat(expandedState.get(node) ? 'flow-root' : 'none') : undefined,
+    class: "".concat(expandClassNames.content, " ").concat(expandedState.get(node) ? '' : expandClassNames.contentCollapsed),
     contenteditable: contentEditable !== undefined ? contentEditable ? 'true' : 'false' : undefined
   }, 0]];
 };

package/dist/esm/singlePlayerExpand/utils.js

@@ -1,6 +1,5 @@
 import { isExpandCollapsed } from '@atlaskit/editor-common/expand';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 // from platform/packages/editor/editor-plugin-find-replace/src/ui/styles.ts
 var darkModeSearchMatchClass = 'search-match-dark';
@@ -8,16 +7,15 @@ var searchMatchExpandTitleClass = 'search-match-expand-title';
 var selectedSearchMatchClass = 'selected-search-match';
 export var findSelectedParentExpandNode = function findSelectedParentExpandNode(state) {
   var nestedOrParentExpand = findParentNodeOfType(state.schema.nodes.nestedExpand)(state.selection) || findParentNodeOfType(state.schema.nodes.expand)(state.selection);
-  if (expValEquals('platform_editor_display_none_to_expand', 'isEnabled', true)) {
-    // If it's nested expand, we should check if its parent expand is collapsed.
-    // If the parent expand is collapsed, the nested expand is not visible,
-    // so it could not be selected.
-    // In this case, we return the parent expand node instead of the nested expand node.
-    if ((nestedOrParentExpand === null || nestedOrParentExpand === void 0 ? void 0 : nestedOrParentExpand.node.type) === state.schema.nodes.nestedExpand) {
-      var parentExpand = findParentNodeOfType(state.schema.nodes.expand)(state.selection);
-      if (parentExpand && isExpandCollapsed(parentExpand.node)) {
-        return parentExpand;
-      }
+
+  // If it's nested expand, we should check if its parent expand is collapsed.
+  // If the parent expand is collapsed, the nested expand is not visible,
+  // so it could not be selected.
+  // In this case, we return the parent expand node instead of the nested expand node.
+  if ((nestedOrParentExpand === null || nestedOrParentExpand === void 0 ? void 0 : nestedOrParentExpand.node.type) === state.schema.nodes.nestedExpand) {
+    var parentExpand = findParentNodeOfType(state.schema.nodes.expand)(state.selection);
+    if (parentExpand && isExpandCollapsed(parentExpand.node)) {
+      return parentExpand;
     }
   }
   return nestedOrParentExpand;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "8.4.3",
+	"version": "8.5.1",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -47,7 +47,7 @@
 		"@atlaskit/icon-lab": "^5.17.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^34.0.0",
+		"@atlaskit/tmp-editor-statsig": "^35.0.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@babel/runtime": "^7.0.0",
@@ -56,7 +56,7 @@
 		"w3c-keyname": "^2.1.8"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.28.0",
+		"@atlaskit/editor-common": "^111.30.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"