@atlaskit/editor-plugin-expand 4.0.0 → 4.1.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-expand
 
+## 4.1.0
+
+### Minor Changes
+
+- [#179798](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179798)
+  [`b74544d17393f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b74544d17393f) -
+  [ux] [ED-27963] this change is creating a new Editor Command inside expandPlugin to toggle open
+  expands with active matches from Find&Replace
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.0.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.0.0
 
 ### Major Changes

package/dist/cjs/legacyExpand/commands.js

@@ -4,11 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateExpandTitle = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.setExpandRef = exports.insertExpandWithInputMethod = exports.insertExpand = exports.focusTitle = exports.focusIcon = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
+exports.updateExpandTitle = exports.toggleExpandWithMatch = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.setExpandRef = exports.insertExpandWithInputMethod = exports.insertExpand = exports.focusTitle = exports.focusIcon = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _selection = require("@atlaskit/editor-common/selection");
+var _selection2 = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -115,7 +115,7 @@ var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandE
       // 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 ? isExpandedNext === true : isExpandedNext === false && (0, _transforms.findExpand)(state)) {
-        tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection.Side.RIGHT));
+        tr.setSelection(new _selection2.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection2.Side.RIGHT));
       }
 
       // log when people open/close expands
@@ -239,4 +239,13 @@ var setSelectionInsideExpand = exports.setSelectionInsideExpand = function setSe
     }
     return false;
   };
+};
+var toggleExpandWithMatch = exports.toggleExpandWithMatch = function toggleExpandWithMatch(_selection) {
+  return function (_ref3) {
+    var tr = _ref3.tr;
+    // this action exists so that we can keep the plugin types consistent across the
+    // the legacy expand plugin and the single player expand plugin until
+    // we will remove the legacy expand plugin
+    return null;
+  };
 };

package/dist/cjs/legacyExpand/plugin.js

@@ -37,6 +37,11 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
       insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
       insertExpandWithInputMethod: (0, _commands.insertExpandWithInputMethod)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
+    commands: {
+      toggleExpandWithMatch: function toggleExpandWithMatch(selection) {
+        return (0, _commands.toggleExpandWithMatch)(selection);
+      }
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'expand',

package/dist/cjs/singlePlayerExpand/commands.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateExpandTitle = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.insertExpandWithInputMethod = exports.insertExpand = exports.focusTitle = exports.focusIcon = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
+exports.updateExpandTitle = exports.toggleExpandWithMatch = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.insertExpandWithInputMethod = exports.insertExpand = exports.focusTitle = exports.focusIcon = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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; }
@@ -229,4 +230,31 @@ var focusIcon = exports.focusIcon = function focusIcon(expand) {
     }
     return false;
   };
+};
+var toggleExpandWithMatch = exports.toggleExpandWithMatch = function toggleExpandWithMatch(selection) {
+  return function (_ref3) {
+    var tr = _ref3.tr;
+    var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+      expand = _tr$doc$type$schema$n.expand,
+      nestedExpand = _tr$doc$type$schema$n.nestedExpand;
+    // if match is inside a nested expand, open the nested expand
+    var nestedExpandNode = (0, _utils2.findParentNodeOfType)(nestedExpand)(selection);
+    if (nestedExpandNode && (0, _expValEquals.expValEquals)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _expandedState$get2;
+      var expanded = (_expandedState$get2 = _expand.expandedState.get(nestedExpandNode.node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
+      if (!expanded) {
+        _expand.expandedState.set(nestedExpandNode.node, true);
+      }
+    }
+    // if match is (also) inside an expand, open the expand
+    var expandNode = (0, _utils2.findParentNodeOfType)(expand)(selection);
+    if (expandNode && (0, _expValEquals.expValEquals)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _expandedState$get3;
+      var _expanded = (_expandedState$get3 = _expand.expandedState.get(expandNode.node)) !== null && _expandedState$get3 !== void 0 ? _expandedState$get3 : false;
+      if (!_expanded) {
+        _expand.expandedState.set(expandNode.node, true);
+      }
+    }
+    return tr;
+  };
 };

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

@@ -33,6 +33,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     var allowInteractiveExpand = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : true;
     var __livePage = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
     var cleanUpEditorDisabledOnChange = arguments.length > 10 ? arguments[10] : undefined;
+    var isExpanded = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
     (0, _classCallCheck2.default)(this, ExpandNodeView);
     (0, _defineProperty2.default)(this, "allowInteractiveExpand", true);
     (0, _defineProperty2.default)(this, "isMobile", false);
@@ -393,6 +394,7 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
     this.cleanUpEditorDisabledOnChange = cleanUpEditorDisabledOnChange;
+    this.isExpanded = isExpanded;
     this.intl = getIntl();
     this.nodeViewPortalProviderAPI = nodeViewPortalProviderAPI;
     this.allowInteractiveExpand = allowInteractiveExpand;
@@ -495,9 +497,17 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
             _expand.expandedState.set(node, wasExpanded);
           }
         }
-        this.node = node;
-        if (!(0, _platformFeatureFlags.fg)('platform_editor_disable_unnecessary_expand_renders')) {
-          this.updateExpandToggleIcon(this.node);
+        if ((0, _expValEquals.expValEquals)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+          this.node = node;
+          var hasChanged = this.isExpanded !== _expand.expandedState.get(node);
+          if (hasChanged) {
+            this.updateExpandToggleIcon(node);
+          }
+        } else {
+          this.node = node;
+          if (!(0, _platformFeatureFlags.fg)('platform_editor_disable_unnecessary_expand_renders')) {
+            this.updateExpandToggleIcon(this.node);
+          }
         }
         return true;
       }
@@ -523,6 +533,9 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
         this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = _expand.expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
       }
       this.updateExpandBodyContentEditable();
+      if ((0, _expValEquals.expValEquals)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+        this.isExpanded = expanded;
+      }
     }
   }, {
     key: "updateExpandBodyContentEditable",

package/dist/cjs/singlePlayerExpand/plugin.js

@@ -37,6 +37,11 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
       insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
       insertExpandWithInputMethod: (0, _commands.insertExpandWithInputMethod)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
+    commands: {
+      toggleExpandWithMatch: function toggleExpandWithMatch(selection) {
+        return (0, _commands.toggleExpandWithMatch)(selection);
+      }
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'expand',

package/dist/cjs/singlePlayerExpand/utils.js

@@ -4,9 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findReplaceExpandDecorations = exports.findParentExpandNode = void 0;
-var _styles = require("@atlaskit/editor-plugin-find-replace/styles");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+// 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 findParentExpandNode = exports.findParentExpandNode = function findParentExpandNode(state) {
   return (0, _utils.findParentNodeOfType)(state.schema.nodes.nestedExpand)(state.selection) || (0, _utils.findParentNodeOfType)(state.schema.nodes.expand)(state.selection);
 };
-var findReplaceExpandDecorations = exports.findReplaceExpandDecorations = [_styles.darkModeSearchMatchClass, _styles.searchMatchExpandTitleClass, _styles.selectedSearchMatchClass];
+var findReplaceExpandDecorations = exports.findReplaceExpandDecorations = [darkModeSearchMatchClass, searchMatchExpandTitleClass, selectedSearchMatchClass];

package/dist/es2019/legacyExpand/commands.js

@@ -218,4 +218,12 @@ export const setSelectionInsideExpand = expandPos => (_state, dispatch, editorVi
     return true;
   }
   return false;
+};
+export const toggleExpandWithMatch = _selection => ({
+  tr
+}) => {
+  // this action exists so that we can keep the plugin types consistent across the
+  // the legacy expand plugin and the single player expand plugin until
+  // we will remove the legacy expand plugin
+  return null;
 };

package/dist/es2019/legacyExpand/plugin.js

@@ -4,7 +4,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
+import { createExpandNode, insertExpand, insertExpandWithInputMethod, toggleExpandWithMatch } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
@@ -31,6 +31,9 @@ export let expandPlugin = ({
       insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
       insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
+    commands: {
+      toggleExpandWithMatch: selection => toggleExpandWithMatch(selection)
+    },
     pmPlugins() {
       return [{
         name: 'expand',

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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isNestedInExpand } from '../utils';
 
 // Creates either an expand or a nestedExpand node based on the current selection
@@ -209,4 +210,31 @@ export const focusIcon = expand => (state, dispatch, editorView) => {
     return true;
   }
   return false;
+};
+export const toggleExpandWithMatch = selection => ({
+  tr
+}) => {
+  const {
+    expand,
+    nestedExpand
+  } = tr.doc.type.schema.nodes;
+  // if match is inside a nested expand, open the nested expand
+  const nestedExpandNode = findParentNodeOfType(nestedExpand)(selection);
+  if (nestedExpandNode && expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+    var _expandedState$get2;
+    const expanded = (_expandedState$get2 = expandedState.get(nestedExpandNode.node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
+    if (!expanded) {
+      expandedState.set(nestedExpandNode.node, true);
+    }
+  }
+  // if match is (also) inside an expand, open the expand
+  const expandNode = findParentNodeOfType(expand)(selection);
+  if (expandNode && expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+    var _expandedState$get3;
+    const expanded = (_expandedState$get3 = expandedState.get(expandNode.node)) !== null && _expandedState$get3 !== void 0 ? _expandedState$get3 : false;
+    if (!expanded) {
+      expandedState.set(expandNode.node, true);
+    }
+  }
+  return tr;
 };

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

@@ -16,7 +16,7 @@ import { ExpandButton } from '../ui/ExpandButton';
 import { buildExpandClassName, toDOM } from '../ui/NodeView';
 import { findReplaceExpandDecorations } from '../utils';
 export class ExpandNodeView {
-  constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange) {
+  constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange, isExpanded = false) {
     var _api$editorDisabled, _api$editorDisabled$s, _this$api6;
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
@@ -392,6 +392,7 @@ export class ExpandNodeView {
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
     this.cleanUpEditorDisabledOnChange = cleanUpEditorDisabledOnChange;
+    this.isExpanded = isExpanded;
     this.intl = getIntl();
     this.nodeViewPortalProviderAPI = nodeViewPortalProviderAPI;
     this.allowInteractiveExpand = allowInteractiveExpand;
@@ -488,9 +489,17 @@ export class ExpandNodeView {
           expandedState.set(node, wasExpanded);
         }
       }
-      this.node = node;
-      if (!fg('platform_editor_disable_unnecessary_expand_renders')) {
-        this.updateExpandToggleIcon(this.node);
+      if (expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+        this.node = node;
+        const hasChanged = this.isExpanded !== expandedState.get(node);
+        if (hasChanged) {
+          this.updateExpandToggleIcon(node);
+        }
+      } else {
+        this.node = node;
+        if (!fg('platform_editor_disable_unnecessary_expand_renders')) {
+          this.updateExpandToggleIcon(this.node);
+        }
       }
       return true;
     }
@@ -512,6 +521,9 @@ export class ExpandNodeView {
       this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
     }
     this.updateExpandBodyContentEditable();
+    if (expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      this.isExpanded = expanded;
+    }
   }
   updateExpandBodyContentEditable() {
     // Disallow interaction/selection inside expand body when collapsed.

package/dist/es2019/singlePlayerExpand/plugin.js

@@ -4,7 +4,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
+import { createExpandNode, insertExpand, insertExpandWithInputMethod, toggleExpandWithMatch } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
@@ -31,6 +31,9 @@ export let expandPlugin = ({
       insertExpand: insertExpand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
       insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
+    commands: {
+      toggleExpandWithMatch: selection => toggleExpandWithMatch(selection)
+    },
     pmPlugins() {
       return [{
         name: 'expand',

package/dist/es2019/singlePlayerExpand/utils.js

@@ -1,5 +1,9 @@
-import { darkModeSearchMatchClass, searchMatchExpandTitleClass, selectedSearchMatchClass } from '@atlaskit/editor-plugin-find-replace/styles';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+
+// from platform/packages/editor/editor-plugin-find-replace/src/ui/styles.ts
+const darkModeSearchMatchClass = 'search-match-dark';
+const searchMatchExpandTitleClass = 'search-match-expand-title';
+const selectedSearchMatchClass = 'selected-search-match';
 export const findParentExpandNode = state => {
   return findParentNodeOfType(state.schema.nodes.nestedExpand)(state.selection) || findParentNodeOfType(state.schema.nodes.expand)(state.selection);
 };

package/dist/esm/legacyExpand/commands.js

@@ -232,4 +232,13 @@ export var setSelectionInsideExpand = function setSelectionInsideExpand(expandPo
     }
     return false;
   };
+};
+export var toggleExpandWithMatch = function toggleExpandWithMatch(_selection) {
+  return function (_ref3) {
+    var tr = _ref3.tr;
+    // this action exists so that we can keep the plugin types consistent across the
+    // the legacy expand plugin and the single player expand plugin until
+    // we will remove the legacy expand plugin
+    return null;
+  };
 };

package/dist/esm/legacyExpand/plugin.js

@@ -4,7 +4,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
+import { createExpandNode, insertExpand, insertExpandWithInputMethod, toggleExpandWithMatch as _toggleExpandWithMatch } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
@@ -31,6 +31,11 @@ export var expandPlugin = function expandPlugin(_ref) {
       insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
       insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
+    commands: {
+      toggleExpandWithMatch: function toggleExpandWithMatch(selection) {
+        return _toggleExpandWithMatch(selection);
+      }
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'expand',

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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isNestedInExpand } from '../utils';
 
 // Creates either an expand or a nestedExpand node based on the current selection
@@ -223,4 +224,31 @@ export var focusIcon = function focusIcon(expand) {
     }
     return false;
   };
+};
+export var toggleExpandWithMatch = function toggleExpandWithMatch(selection) {
+  return function (_ref3) {
+    var tr = _ref3.tr;
+    var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+      expand = _tr$doc$type$schema$n.expand,
+      nestedExpand = _tr$doc$type$schema$n.nestedExpand;
+    // if match is inside a nested expand, open the nested expand
+    var nestedExpandNode = findParentNodeOfType(nestedExpand)(selection);
+    if (nestedExpandNode && expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _expandedState$get2;
+      var expanded = (_expandedState$get2 = expandedState.get(nestedExpandNode.node)) !== null && _expandedState$get2 !== void 0 ? _expandedState$get2 : false;
+      if (!expanded) {
+        expandedState.set(nestedExpandNode.node, true);
+      }
+    }
+    // if match is (also) inside an expand, open the expand
+    var expandNode = findParentNodeOfType(expand)(selection);
+    if (expandNode && expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _expandedState$get3;
+      var _expanded = (_expandedState$get3 = expandedState.get(expandNode.node)) !== null && _expandedState$get3 !== void 0 ? _expandedState$get3 : false;
+      if (!_expanded) {
+        expandedState.set(expandNode.node, true);
+      }
+    }
+    return tr;
+  };
 };

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

@@ -25,6 +25,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     var allowInteractiveExpand = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : true;
     var __livePage = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
     var cleanUpEditorDisabledOnChange = arguments.length > 10 ? arguments[10] : undefined;
+    var isExpanded = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
     _classCallCheck(this, ExpandNodeView);
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
@@ -385,6 +386,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     this.selectNearNode = selectNearNode;
     this.__livePage = __livePage;
     this.cleanUpEditorDisabledOnChange = cleanUpEditorDisabledOnChange;
+    this.isExpanded = isExpanded;
     this.intl = getIntl();
     this.nodeViewPortalProviderAPI = nodeViewPortalProviderAPI;
     this.allowInteractiveExpand = allowInteractiveExpand;
@@ -487,9 +489,17 @@ export var ExpandNodeView = /*#__PURE__*/function () {
             expandedState.set(node, wasExpanded);
           }
         }
-        this.node = node;
-        if (!fg('platform_editor_disable_unnecessary_expand_renders')) {
-          this.updateExpandToggleIcon(this.node);
+        if (expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+          this.node = node;
+          var hasChanged = this.isExpanded !== expandedState.get(node);
+          if (hasChanged) {
+            this.updateExpandToggleIcon(node);
+          }
+        } else {
+          this.node = node;
+          if (!fg('platform_editor_disable_unnecessary_expand_renders')) {
+            this.updateExpandToggleIcon(this.node);
+          }
         }
         return true;
       }
@@ -515,6 +525,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
       }
       this.updateExpandBodyContentEditable();
+      if (expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+        this.isExpanded = expanded;
+      }
     }
   }, {
     key: "updateExpandBodyContentEditable",

package/dist/esm/singlePlayerExpand/plugin.js

@@ -4,7 +4,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
-import { createExpandNode, insertExpand, insertExpandWithInputMethod } from './commands';
+import { createExpandNode, insertExpand, insertExpandWithInputMethod, toggleExpandWithMatch as _toggleExpandWithMatch } from './commands';
 import { expandKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { getToolbarConfig } from './toolbar';
@@ -31,6 +31,11 @@ export var expandPlugin = function expandPlugin(_ref) {
       insertExpand: insertExpand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
       insertExpandWithInputMethod: insertExpandWithInputMethod(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
+    commands: {
+      toggleExpandWithMatch: function toggleExpandWithMatch(selection) {
+        return _toggleExpandWithMatch(selection);
+      }
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'expand',

package/dist/esm/singlePlayerExpand/utils.js

@@ -1,5 +1,9 @@
-import { darkModeSearchMatchClass, searchMatchExpandTitleClass, selectedSearchMatchClass } from '@atlaskit/editor-plugin-find-replace/styles';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+
+// 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';
 export var findParentExpandNode = function findParentExpandNode(state) {
   return findParentNodeOfType(state.schema.nodes.nestedExpand)(state.selection) || findParentNodeOfType(state.schema.nodes.expand)(state.selection);
 };

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

@@ -1,6 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { InsertMethod } from '../types';
 export declare const setExpandRef: (ref?: HTMLDivElement | null) => Command;
@@ -24,3 +25,4 @@ export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | und
 export declare const focusTitle: (pos: number) => Command;
 export declare const focusIcon: (expand: Node) => Command;
 export declare const setSelectionInsideExpand: (expandPos: number) => Command;
+export declare const toggleExpandWithMatch: (_selection: Selection) => EditorCommand;

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

@@ -1,7 +1,8 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand } 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 { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { InsertMethod } from '../types';
 export declare const createExpandNode: (state: EditorState, setExpandedState?: boolean) => PMNode | null;
 export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertMethod) => Command;
@@ -21,3 +22,4 @@ export declare const updateExpandTitle: ({ title, nodeType, pos }: {
 }) => Command;
 export declare const focusTitle: (pos: number) => Command;
 export declare const focusIcon: (expand: Node) => Command;
+export declare const toggleExpandWithMatch: (selection: Selection) => EditorCommand;

package/dist/types/singlePlayerExpand/node-views/index.d.ts

@@ -9,6 +9,7 @@ export declare class ExpandNodeView implements NodeView {
     private selectNearNode;
     private __livePage;
     private cleanUpEditorDisabledOnChange?;
+    private isExpanded;
     node: PmNode;
     view: EditorView;
     dom: HTMLElement;
@@ -25,7 +26,7 @@ export declare class ExpandNodeView implements NodeView {
     nodeViewPortalProviderAPI: PortalProviderAPI;
     decorationCleanup?: () => boolean | undefined;
     renderKey: string;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, nodeViewPortalProviderAPI: PortalProviderAPI, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, nodeViewPortalProviderAPI: PortalProviderAPI, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined, isExpanded?: boolean | undefined);
     private focusTitle;
     private handleIconKeyDown;
     private handleClick;

package/dist/types/types.d.ts

@@ -1,5 +1,5 @@
 import { type INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { EditorAppearance, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, EditorCommand, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
@@ -7,6 +7,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { SelectionMarkerPlugin } from '@atlaskit/editor-plugin-selection-marker';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { insertExpand, insertExpandWithInputMethod } from './legacyExpand/commands';
 export interface ExpandPluginState {
     expandRef?: HTMLDivElement | null;
@@ -60,4 +61,10 @@ export type ExpandPlugin = NextEditorPlugin<'expand', {
          */
         insertExpandWithInputMethod: ReturnType<typeof insertExpandWithInputMethod>;
     };
+    commands: {
+        /**
+         * Toggle the expand or nested expand node open
+         */
+        toggleExpandWithMatch: (selection: Selection) => EditorCommand;
+    };
 }>;

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

@@ -1,6 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { InsertMethod } from '../types';
 export declare const setExpandRef: (ref?: HTMLDivElement | null) => Command;
@@ -24,3 +25,4 @@ export declare const insertExpand: (editorAnalyticsAPI: EditorAnalyticsAPI | und
 export declare const focusTitle: (pos: number) => Command;
 export declare const focusIcon: (expand: Node) => Command;
 export declare const setSelectionInsideExpand: (expandPos: number) => Command;
+export declare const toggleExpandWithMatch: (_selection: Selection) => EditorCommand;

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

@@ -1,7 +1,8 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand } 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 { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { InsertMethod } from '../types';
 export declare const createExpandNode: (state: EditorState, setExpandedState?: boolean) => PMNode | null;
 export declare const insertExpandWithInputMethod: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertMethod) => Command;
@@ -21,3 +22,4 @@ export declare const updateExpandTitle: ({ title, nodeType, pos }: {
 }) => Command;
 export declare const focusTitle: (pos: number) => Command;
 export declare const focusIcon: (expand: Node) => Command;
+export declare const toggleExpandWithMatch: (selection: Selection) => EditorCommand;

package/dist/types-ts4.5/singlePlayerExpand/node-views/index.d.ts

@@ -9,6 +9,7 @@ export declare class ExpandNodeView implements NodeView {
     private selectNearNode;
     private __livePage;
     private cleanUpEditorDisabledOnChange?;
+    private isExpanded;
     node: PmNode;
     view: EditorView;
     dom: HTMLElement;
@@ -25,7 +26,7 @@ export declare class ExpandNodeView implements NodeView {
     nodeViewPortalProviderAPI: PortalProviderAPI;
     decorationCleanup?: () => boolean | undefined;
     renderKey: string;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, nodeViewPortalProviderAPI: PortalProviderAPI, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined);
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, selectNearNode: SetSelectionRelativeToNode | undefined, api: ExtractInjectionAPI<ExpandPlugin> | undefined, nodeViewPortalProviderAPI: PortalProviderAPI, allowInteractiveExpand?: boolean, __livePage?: boolean, cleanUpEditorDisabledOnChange?: (() => void) | undefined, isExpanded?: boolean | undefined);
     private focusTitle;
     private handleIconKeyDown;
     private handleClick;

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

@@ -1,5 +1,5 @@
 import { type INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { EditorAppearance, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, EditorCommand, LongPressSelectionPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
@@ -7,6 +7,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { SelectionMarkerPlugin } from '@atlaskit/editor-plugin-selection-marker';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { insertExpand, insertExpandWithInputMethod } from './legacyExpand/commands';
 export interface ExpandPluginState {
     expandRef?: HTMLDivElement | null;
@@ -60,4 +61,10 @@ export type ExpandPlugin = NextEditorPlugin<'expand', {
          */
         insertExpandWithInputMethod: ReturnType<typeof insertExpandWithInputMethod>;
     };
+    commands: {
+        /**
+         * Toggle the expand or nested expand node open
+         */
+        toggleExpandWithMatch: (selection: Selection) => EditorCommand;
+    };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "4.0.0",
+	"version": "4.1.0",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,15 +38,14 @@
 		"@atlaskit/editor-plugin-decorations": "^3.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^3.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^5.0.0",
-		"@atlaskit/editor-plugin-find-replace": "^3.0.0",
 		"@atlaskit/editor-plugin-selection": "^3.0.0",
 		"@atlaskit/editor-plugin-selection-marker": "^3.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^27.2.0",
+		"@atlaskit/icon": "^27.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^8.7.0",
+		"@atlaskit/tmp-editor-statsig": "^9.1.0",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -55,7 +54,7 @@
 		"w3c-keyname": "^2.1.8"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.6.0",
+		"@atlaskit/editor-common": "^107.7.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"