@atlaskit/editor-plugin-find-replace 3.0.2 → 3.1.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 3.1.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.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
+
 ## 3.0.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/commands-with-analytics.js

@@ -36,7 +36,7 @@ var findWithAnalytics = exports.findWithAnalytics = function findWithAnalytics(e
     })((0, _commands.find)(editorView, containerElement, keyword));
   };
 };
-var findNextWithAnalytics = exports.findNextWithAnalytics = function findNextWithAnalytics(editorAnalyticsAPI) {
+var findNextWithAnalytics = exports.findNextWithAnalytics = function findNextWithAnalytics(editorAnalyticsAPI, editorView) {
   return function (_ref3) {
     var triggerMethod = _ref3.triggerMethod;
     return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
@@ -46,10 +46,10 @@ var findNextWithAnalytics = exports.findNextWithAnalytics = function findNextWit
       attributes: {
         triggerMethod: triggerMethod
       }
-    })((0, _commands.findNext)());
+    })((0, _commands.findNext)(editorView));
   };
 };
-var findPrevWithAnalytics = exports.findPrevWithAnalytics = function findPrevWithAnalytics(editorAnalyticsAPI) {
+var findPrevWithAnalytics = exports.findPrevWithAnalytics = function findPrevWithAnalytics(editorAnalyticsAPI, editorView) {
   return function (_ref4) {
     var triggerMethod = _ref4.triggerMethod;
     return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
@@ -59,7 +59,7 @@ var findPrevWithAnalytics = exports.findPrevWithAnalytics = function findPrevWit
       attributes: {
         triggerMethod: triggerMethod
       }
-    })((0, _commands.findPrevious)());
+    })((0, _commands.findPrevious)(editorView));
   };
 };
 var replaceWithAnalytics = exports.replaceWithAnalytics = function replaceWithAnalytics(editorAnalyticsAPI) {

package/dist/cjs/pm-plugins/commands.js

@@ -9,6 +9,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _actions = require("./actions");
 var _pluginFactory = require("./plugin-factory");
 var _utils = require("./utils");
@@ -89,18 +90,27 @@ var find = exports.find = function find(editorView, containerElement, keyword) {
     }) : [];
     if (matches.length > 0) {
       var index = (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_improvements_1') ? (0, _utils.findClosestMatch)(selection.from, matches) : (0, _utils.findSearchIndex)(selection.from, matches);
-      return tr.setSelection((0, _utils.getSelectionForMatch)(tr.selection, tr.doc, index, matches));
+      var newSelection = (0, _utils.getSelectionForMatch)(tr.selection, tr.doc, index, matches);
+      if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+        var _api$expand;
+        // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+        api === null || api === void 0 || (_api$expand = api.expand) === null || _api$expand === void 0 || _api$expand.commands.toggleExpandWithMatch(newSelection)({
+          tr: tr
+        });
+      }
+      return tr.setSelection(newSelection);
     }
     return tr;
   }));
 };
-var findNext = exports.findNext = function findNext() {
+var findNext = exports.findNext = function findNext(editorView) {
   return (0, _commands.withScrollIntoView)((0, _pluginFactory.createCommand)(function (state) {
     return findInDirection(state, 'next');
   }, function (tr, state) {
     var _getPluginState4 = (0, _pluginFactory.getPluginState)(state),
       matches = _getPluginState4.matches,
-      index = _getPluginState4.index;
+      index = _getPluginState4.index,
+      api = _getPluginState4.api;
     // can't use index from plugin state because if the cursor has moved, it will still be the
     // OLD index (the find next operation should look for the first match forward starting
     // from the current cursor position)
@@ -109,20 +119,37 @@ var findNext = exports.findNext = function findNext() {
       // cursor has not moved, so we just want to find the next in matches array
       searchIndex = (0, _utils.nextIndex)(searchIndex, matches.length);
     }
-    return tr.setSelection((0, _utils.getSelectionForMatch)(tr.selection, tr.doc, searchIndex, matches));
+    var newSelection = (0, _utils.getSelectionForMatch)(tr.selection, tr.doc, searchIndex, matches);
+    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _api$expand2;
+      // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+      api === null || api === void 0 || (_api$expand2 = api.expand) === null || _api$expand2 === void 0 || _api$expand2.commands.toggleExpandWithMatch(newSelection)({
+        tr: tr
+      });
+    }
+    return tr.setSelection(newSelection);
   }));
 };
-var findPrevious = exports.findPrevious = function findPrevious() {
+var findPrevious = exports.findPrevious = function findPrevious(editorView) {
   return (0, _commands.withScrollIntoView)((0, _pluginFactory.createCommand)(function (state) {
     return findInDirection(state, 'previous');
   }, function (tr, state) {
     var _getPluginState5 = (0, _pluginFactory.getPluginState)(state),
-      matches = _getPluginState5.matches;
+      matches = _getPluginState5.matches,
+      api = _getPluginState5.api;
     // can't use index from plugin state because if the cursor has moved, it will still be the
     // OLD index (the find prev operation should look for the first match backward starting
     // from the current cursor position)
     var searchIndex = (0, _utils.findSearchIndex)(state.selection.from, matches, true);
-    return tr.setSelection((0, _utils.getSelectionForMatch)(tr.selection, tr.doc, searchIndex, matches));
+    var newSelection = (0, _utils.getSelectionForMatch)(tr.selection, tr.doc, searchIndex, matches);
+    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _api$expand3;
+      // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+      api === null || api === void 0 || (_api$expand3 = api.expand) === null || _api$expand3 === void 0 || _api$expand3.commands.toggleExpandWithMatch(newSelection)({
+        tr: tr
+      });
+    }
+    return tr.setSelection(newSelection);
   }));
 };
 var findInDirection = function findInDirection(state, dir) {

package/dist/cjs/pm-plugins/main.js

@@ -27,7 +27,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, getInt
   return new _safePlugin.SafePlugin({
     key: _pluginKey.findReplacePluginKey,
     state: (0, _pluginFactory.createPluginState)(dispatch, function () {
-      return (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? _objectSpread(_objectSpread({}, initialState), {}, {
+      return (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) || (0, _expValEquals.expValEquals)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true) ? _objectSpread(_objectSpread({}, initialState), {}, {
         getIntl: getIntl,
         api: api
       }) : _objectSpread({}, initialState);

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -11,6 +11,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _main = require("./main");
 var _pluginKey = require("./plugin-key");
 var _reducer = _interopRequireDefault(require("./reducer"));
@@ -110,6 +111,14 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
   if (newSelectedMatch) {
     decorationSet = decorationSet.add(tr.doc, (0, _utils2.createDecorations)(0, [newSelectedMatch]));
   }
+  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+    var _api$expand;
+    var newSelection = (0, _utils2.getSelectionForMatch)(tr.selection, tr.doc, newIndex, newMatches);
+    // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+    api === null || api === void 0 || (_api$expand = api.expand) === null || _api$expand === void 0 || _api$expand.commands.toggleExpandWithMatch(newSelection)({
+      tr: tr
+    });
+  }
   return _objectSpread(_objectSpread({}, pluginState), {}, {
     matches: newMatches,
     index: newIndex,

package/dist/cjs/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -100,7 +100,7 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleFindNext = function handleFindNext(_ref3) {
     var triggerMethod = _ref3.triggerMethod;
     runWithEditorFocused(function () {
-      return dispatchCommand((0, _commandsWithAnalytics.findNextWithAnalytics)(editorAnalyticsAPI)({
+      return dispatchCommand((0, _commandsWithAnalytics.findNextWithAnalytics)(editorAnalyticsAPI, editorView)({
         triggerMethod: triggerMethod
       }));
     });
@@ -108,7 +108,7 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleFindPrev = function handleFindPrev(_ref4) {
     var triggerMethod = _ref4.triggerMethod;
     runWithEditorFocused(function () {
-      return dispatchCommand((0, _commandsWithAnalytics.findPrevWithAnalytics)(editorAnalyticsAPI)({
+      return dispatchCommand((0, _commandsWithAnalytics.findPrevWithAnalytics)(editorAnalyticsAPI, editorView)({
         triggerMethod: triggerMethod
       }));
     });

package/dist/es2019/pm-plugins/commands-with-analytics.js

@@ -22,17 +22,19 @@ export const findWithAnalytics = editorAnalyticsAPI => ({
   action: ACTION.FIND_PERFORMED,
   actionSubject: ACTION_SUBJECT.TEXT
 })(find(editorView, containerElement, keyword));
-export const findNextWithAnalytics = editorAnalyticsAPI => ({
+export const findNextWithAnalytics = (editorAnalyticsAPI, editorView) => ({
   triggerMethod
-}) => withAnalytics(editorAnalyticsAPI, {
-  eventType: EVENT_TYPE.TRACK,
-  action: ACTION.FIND_NEXT_PERFORMED,
-  actionSubject: ACTION_SUBJECT.TEXT,
-  attributes: {
-    triggerMethod
-  }
-})(findNext());
-export const findPrevWithAnalytics = editorAnalyticsAPI => ({
+}) => {
+  return withAnalytics(editorAnalyticsAPI, {
+    eventType: EVENT_TYPE.TRACK,
+    action: ACTION.FIND_NEXT_PERFORMED,
+    actionSubject: ACTION_SUBJECT.TEXT,
+    attributes: {
+      triggerMethod
+    }
+  })(findNext(editorView));
+};
+export const findPrevWithAnalytics = (editorAnalyticsAPI, editorView) => ({
   triggerMethod
 }) => withAnalytics(editorAnalyticsAPI, {
   eventType: EVENT_TYPE.TRACK,
@@ -41,7 +43,7 @@ export const findPrevWithAnalytics = editorAnalyticsAPI => ({
   attributes: {
     triggerMethod
   }
-})(findPrevious());
+})(findPrevious(editorView));
 export const replaceWithAnalytics = editorAnalyticsAPI => ({
   triggerMethod,
   replaceText

package/dist/es2019/pm-plugins/commands.js

@@ -2,6 +2,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { FindReplaceActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
 import { createDecoration, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, getSelectedText, getSelectionForMatch, nextIndex, prevIndex, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
@@ -84,14 +85,23 @@ export const find = (editorView, containerElement, keyword) => withScrollIntoVie
   }) : [];
   if (matches.length > 0) {
     const index = expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_and_replace_improvements_1') ? findClosestMatch(selection.from, matches) : findSearchIndex(selection.from, matches);
-    return tr.setSelection(getSelectionForMatch(tr.selection, tr.doc, index, matches));
+    const newSelection = getSelectionForMatch(tr.selection, tr.doc, index, matches);
+    if (expValEqualsNoExposure('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _api$expand;
+      // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+      api === null || api === void 0 ? void 0 : (_api$expand = api.expand) === null || _api$expand === void 0 ? void 0 : _api$expand.commands.toggleExpandWithMatch(newSelection)({
+        tr
+      });
+    }
+    return tr.setSelection(newSelection);
   }
   return tr;
 }));
-export const findNext = () => withScrollIntoView(createCommand(state => findInDirection(state, 'next'), (tr, state) => {
+export const findNext = editorView => withScrollIntoView(createCommand(state => findInDirection(state, 'next'), (tr, state) => {
   const {
     matches,
-    index
+    index,
+    api
   } = getPluginState(state);
   // can't use index from plugin state because if the cursor has moved, it will still be the
   // OLD index (the find next operation should look for the first match forward starting
@@ -101,17 +111,34 @@ export const findNext = () => withScrollIntoView(createCommand(state => findInDi
     // cursor has not moved, so we just want to find the next in matches array
     searchIndex = nextIndex(searchIndex, matches.length);
   }
-  return tr.setSelection(getSelectionForMatch(tr.selection, tr.doc, searchIndex, matches));
+  const newSelection = getSelectionForMatch(tr.selection, tr.doc, searchIndex, matches);
+  if (expValEqualsNoExposure('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+    var _api$expand2;
+    // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+    api === null || api === void 0 ? void 0 : (_api$expand2 = api.expand) === null || _api$expand2 === void 0 ? void 0 : _api$expand2.commands.toggleExpandWithMatch(newSelection)({
+      tr
+    });
+  }
+  return tr.setSelection(newSelection);
 }));
-export const findPrevious = () => withScrollIntoView(createCommand(state => findInDirection(state, 'previous'), (tr, state) => {
+export const findPrevious = editorView => withScrollIntoView(createCommand(state => findInDirection(state, 'previous'), (tr, state) => {
   const {
-    matches
+    matches,
+    api
   } = getPluginState(state);
   // can't use index from plugin state because if the cursor has moved, it will still be the
   // OLD index (the find prev operation should look for the first match backward starting
   // from the current cursor position)
   const searchIndex = findSearchIndex(state.selection.from, matches, true);
-  return tr.setSelection(getSelectionForMatch(tr.selection, tr.doc, searchIndex, matches));
+  const newSelection = getSelectionForMatch(tr.selection, tr.doc, searchIndex, matches);
+  if (expValEqualsNoExposure('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+    var _api$expand3;
+    // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+    api === null || api === void 0 ? void 0 : (_api$expand3 = api.expand) === null || _api$expand3 === void 0 ? void 0 : _api$expand3.commands.toggleExpandWithMatch(newSelection)({
+      tr
+    });
+  }
+  return tr.setSelection(newSelection);
 }));
 const findInDirection = (state, dir) => {
   const pluginState = getPluginState(state);

package/dist/es2019/pm-plugins/main.js

@@ -16,7 +16,7 @@ export const initialState = {
 export const createPlugin = (dispatch, getIntl, api) => {
   return new SafePlugin({
     key: findReplacePluginKey,
-    state: createPluginState(dispatch, () => expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? {
+    state: createPluginState(dispatch, () => expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) || expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true) ? {
       ...initialState,
       getIntl,
       api

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -2,10 +2,11 @@ import { pluginFactory, stepHasSlice } from '@atlaskit/editor-common/utils';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { initialState } from './main';
 import { findReplacePluginKey } from './plugin-key';
 import reducer from './reducer';
-import { createDecorations, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
+import { createDecorations, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, getSelectionForMatch, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
 import { findUniqueItemsIn } from './utils/array'; // TODO: ED-26959 - move into index export
 
 const handleDocChanged = (tr, pluginState) => {
@@ -90,6 +91,14 @@ const handleDocChanged = (tr, pluginState) => {
   if (newSelectedMatch) {
     decorationSet = decorationSet.add(tr.doc, createDecorations(0, [newSelectedMatch]));
   }
+  if (expValEqualsNoExposure('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+    var _api$expand;
+    const newSelection = getSelectionForMatch(tr.selection, tr.doc, newIndex, newMatches);
+    // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+    api === null || api === void 0 ? void 0 : (_api$expand = api.expand) === null || _api$expand === void 0 ? void 0 : _api$expand.commands.toggleExpandWithMatch(newSelection)({
+      tr: tr
+    });
+  }
   return {
     ...pluginState,
     matches: newMatches,

package/dist/es2019/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -89,14 +89,14 @@ const FindReplaceToolbarButtonWithState = ({
   const handleFindNext = ({
     triggerMethod
   }) => {
-    runWithEditorFocused(() => dispatchCommand(findNextWithAnalytics(editorAnalyticsAPI)({
+    runWithEditorFocused(() => dispatchCommand(findNextWithAnalytics(editorAnalyticsAPI, editorView)({
       triggerMethod
     })));
   };
   const handleFindPrev = ({
     triggerMethod
   }) => {
-    runWithEditorFocused(() => dispatchCommand(findPrevWithAnalytics(editorAnalyticsAPI)({
+    runWithEditorFocused(() => dispatchCommand(findPrevWithAnalytics(editorAnalyticsAPI, editorView)({
       triggerMethod
     })));
   };

package/dist/esm/pm-plugins/commands-with-analytics.js

@@ -30,7 +30,7 @@ export var findWithAnalytics = function findWithAnalytics(editorAnalyticsAPI) {
     })(find(editorView, containerElement, keyword));
   };
 };
-export var findNextWithAnalytics = function findNextWithAnalytics(editorAnalyticsAPI) {
+export var findNextWithAnalytics = function findNextWithAnalytics(editorAnalyticsAPI, editorView) {
   return function (_ref3) {
     var triggerMethod = _ref3.triggerMethod;
     return withAnalytics(editorAnalyticsAPI, {
@@ -40,10 +40,10 @@ export var findNextWithAnalytics = function findNextWithAnalytics(editorAnalytic
       attributes: {
         triggerMethod: triggerMethod
       }
-    })(findNext());
+    })(findNext(editorView));
   };
 };
-export var findPrevWithAnalytics = function findPrevWithAnalytics(editorAnalyticsAPI) {
+export var findPrevWithAnalytics = function findPrevWithAnalytics(editorAnalyticsAPI, editorView) {
   return function (_ref4) {
     var triggerMethod = _ref4.triggerMethod;
     return withAnalytics(editorAnalyticsAPI, {
@@ -53,7 +53,7 @@ export var findPrevWithAnalytics = function findPrevWithAnalytics(editorAnalytic
       attributes: {
         triggerMethod: triggerMethod
       }
-    })(findPrevious());
+    })(findPrevious(editorView));
   };
 };
 export var replaceWithAnalytics = function replaceWithAnalytics(editorAnalyticsAPI) {

package/dist/esm/pm-plugins/commands.js

@@ -2,6 +2,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { FindReplaceActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
 import { createDecoration, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, getSelectedText, getSelectionForMatch, nextIndex, prevIndex, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
@@ -82,18 +83,27 @@ export var find = function find(editorView, containerElement, keyword) {
     }) : [];
     if (matches.length > 0) {
       var index = expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_and_replace_improvements_1') ? findClosestMatch(selection.from, matches) : findSearchIndex(selection.from, matches);
-      return tr.setSelection(getSelectionForMatch(tr.selection, tr.doc, index, matches));
+      var newSelection = getSelectionForMatch(tr.selection, tr.doc, index, matches);
+      if (expValEqualsNoExposure('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+        var _api$expand;
+        // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+        api === null || api === void 0 || (_api$expand = api.expand) === null || _api$expand === void 0 || _api$expand.commands.toggleExpandWithMatch(newSelection)({
+          tr: tr
+        });
+      }
+      return tr.setSelection(newSelection);
     }
     return tr;
   }));
 };
-export var findNext = function findNext() {
+export var findNext = function findNext(editorView) {
   return withScrollIntoView(createCommand(function (state) {
     return findInDirection(state, 'next');
   }, function (tr, state) {
     var _getPluginState4 = getPluginState(state),
       matches = _getPluginState4.matches,
-      index = _getPluginState4.index;
+      index = _getPluginState4.index,
+      api = _getPluginState4.api;
     // can't use index from plugin state because if the cursor has moved, it will still be the
     // OLD index (the find next operation should look for the first match forward starting
     // from the current cursor position)
@@ -102,20 +112,37 @@ export var findNext = function findNext() {
       // cursor has not moved, so we just want to find the next in matches array
       searchIndex = nextIndex(searchIndex, matches.length);
     }
-    return tr.setSelection(getSelectionForMatch(tr.selection, tr.doc, searchIndex, matches));
+    var newSelection = getSelectionForMatch(tr.selection, tr.doc, searchIndex, matches);
+    if (expValEqualsNoExposure('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _api$expand2;
+      // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+      api === null || api === void 0 || (_api$expand2 = api.expand) === null || _api$expand2 === void 0 || _api$expand2.commands.toggleExpandWithMatch(newSelection)({
+        tr: tr
+      });
+    }
+    return tr.setSelection(newSelection);
   }));
 };
-export var findPrevious = function findPrevious() {
+export var findPrevious = function findPrevious(editorView) {
   return withScrollIntoView(createCommand(function (state) {
     return findInDirection(state, 'previous');
   }, function (tr, state) {
     var _getPluginState5 = getPluginState(state),
-      matches = _getPluginState5.matches;
+      matches = _getPluginState5.matches,
+      api = _getPluginState5.api;
     // can't use index from plugin state because if the cursor has moved, it will still be the
     // OLD index (the find prev operation should look for the first match backward starting
     // from the current cursor position)
     var searchIndex = findSearchIndex(state.selection.from, matches, true);
-    return tr.setSelection(getSelectionForMatch(tr.selection, tr.doc, searchIndex, matches));
+    var newSelection = getSelectionForMatch(tr.selection, tr.doc, searchIndex, matches);
+    if (expValEqualsNoExposure('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+      var _api$expand3;
+      // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+      api === null || api === void 0 || (_api$expand3 = api.expand) === null || _api$expand3 === void 0 || _api$expand3.commands.toggleExpandWithMatch(newSelection)({
+        tr: tr
+      });
+    }
+    return tr.setSelection(newSelection);
   }));
 };
 var findInDirection = function findInDirection(state, dir) {

package/dist/esm/pm-plugins/main.js

@@ -20,7 +20,7 @@ export var createPlugin = function createPlugin(dispatch, getIntl, api) {
   return new SafePlugin({
     key: findReplacePluginKey,
     state: createPluginState(dispatch, function () {
-      return expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? _objectSpread(_objectSpread({}, initialState), {}, {
+      return expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) || expValEquals('platform_editor_toggle_expand_on_match_found', 'isEnabled', true) ? _objectSpread(_objectSpread({}, initialState), {}, {
         getIntl: getIntl,
         api: api
       }) : _objectSpread({}, initialState);

package/dist/esm/pm-plugins/plugin-factory.js

@@ -6,10 +6,11 @@ import { pluginFactory, stepHasSlice } from '@atlaskit/editor-common/utils';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { initialState } from './main';
 import { findReplacePluginKey } from './plugin-key';
 import reducer from './reducer';
-import { createDecorations, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
+import { createDecorations, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, getSelectionForMatch, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
 import { findUniqueItemsIn } from './utils/array'; // TODO: ED-26959 - move into index export
 
 var handleDocChanged = function handleDocChanged(tr, pluginState) {
@@ -102,6 +103,14 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
   if (newSelectedMatch) {
     decorationSet = decorationSet.add(tr.doc, createDecorations(0, [newSelectedMatch]));
   }
+  if (expValEqualsNoExposure('platform_editor_toggle_expand_on_match_found', 'isEnabled', true)) {
+    var _api$expand;
+    var newSelection = getSelectionForMatch(tr.selection, tr.doc, newIndex, newMatches);
+    // the exposure is fired inside toggleExpandWithMatch when user is exposed to the experiment
+    api === null || api === void 0 || (_api$expand = api.expand) === null || _api$expand === void 0 || _api$expand.commands.toggleExpandWithMatch(newSelection)({
+      tr: tr
+    });
+  }
   return _objectSpread(_objectSpread({}, pluginState), {}, {
     matches: newMatches,
     index: newIndex,

package/dist/esm/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -92,7 +92,7 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleFindNext = function handleFindNext(_ref3) {
     var triggerMethod = _ref3.triggerMethod;
     runWithEditorFocused(function () {
-      return dispatchCommand(findNextWithAnalytics(editorAnalyticsAPI)({
+      return dispatchCommand(findNextWithAnalytics(editorAnalyticsAPI, editorView)({
         triggerMethod: triggerMethod
       }));
     });
@@ -100,7 +100,7 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleFindPrev = function handleFindPrev(_ref4) {
     var triggerMethod = _ref4.triggerMethod;
     runWithEditorFocused(function () {
-      return dispatchCommand(findPrevWithAnalytics(editorAnalyticsAPI)({
+      return dispatchCommand(findPrevWithAnalytics(editorAnalyticsAPI, editorView)({
         triggerMethod: triggerMethod
       }));
     });

package/dist/types/findReplacePluginType.d.ts

@@ -3,6 +3,7 @@ import { type TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { CardPlugin } from '@atlaskit/editor-plugin-card';
+import type { ExpandPlugin } from '@atlaskit/editor-plugin-expand';
 import type { MentionsPlugin } from '@atlaskit/editor-plugin-mentions';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { FindReplacePluginState, FindReplaceToolbarButtonActionProps } from './types';
@@ -14,7 +15,8 @@ export type FindReplacePluginDependencies = [
     OptionalPlugin<AnalyticsPlugin>,
     OptionalPlugin<PrimaryToolbarPlugin>,
     OptionalPlugin<MentionsPlugin>,
-    OptionalPlugin<CardPlugin>
+    OptionalPlugin<CardPlugin>,
+    OptionalPlugin<ExpandPlugin>
 ];
 export type FindReplacePlugin = NextEditorPlugin<'findReplace', {
     pluginConfiguration: FindReplacePluginOptions;

package/dist/types/pm-plugins/commands-with-analytics.d.ts

@@ -9,10 +9,10 @@ export declare const findWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI
     containerElement: HTMLElement | null;
     keyword?: string | undefined;
 }) => Command;
-export declare const findNextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ triggerMethod, }: {
+export declare const findNextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorView: EditorView) => ({ triggerMethod, }: {
     triggerMethod: TRIGGER_METHOD.KEYBOARD | TRIGGER_METHOD.BUTTON;
 }) => Command;
-export declare const findPrevWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ triggerMethod, }: {
+export declare const findPrevWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorView: EditorView) => ({ triggerMethod, }: {
     triggerMethod: TRIGGER_METHOD.KEYBOARD | TRIGGER_METHOD.BUTTON;
 }) => Command;
 export declare const replaceWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ triggerMethod, replaceText, }: {

package/dist/types/pm-plugins/commands.d.ts

@@ -1,8 +1,8 @@
 import type { Decoration, EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const activate: () => import("@atlaskit/editor-common/types").Command;
 export declare const find: (editorView: EditorView, containerElement: HTMLElement | null, keyword?: string) => import("@atlaskit/editor-common/types").Command;
-export declare const findNext: () => import("@atlaskit/editor-common/types").Command;
-export declare const findPrevious: () => import("@atlaskit/editor-common/types").Command;
+export declare const findNext: (editorView: EditorView) => import("@atlaskit/editor-common/types").Command;
+export declare const findPrevious: (editorView: EditorView) => import("@atlaskit/editor-common/types").Command;
 export declare const replace: (replaceText: string) => import("@atlaskit/editor-common/types").Command;
 export declare const replaceAll: (replaceText: string) => import("@atlaskit/editor-common/types").Command;
 export declare const addDecorations: (decorations: Decoration[]) => import("@atlaskit/editor-common/types").Command;

package/dist/types/pm-plugins/plugin-factory.d.ts

@@ -1,2 +1,3 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { FindReplacePluginState } from '../types';
-export declare const createCommand: <A = import("./actions").FindReplaceAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: ((tr: import("prosemirror-state").Transaction, state: import("prosemirror-state").EditorState) => import("prosemirror-state").Transaction) | undefined) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => FindReplacePluginState, createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: FindReplacePluginState | ((state: import("prosemirror-state").EditorState) => FindReplacePluginState)) => import("prosemirror-state").SafeStateField<FindReplacePluginState>;
+export declare const createCommand: <A = import("./actions").FindReplaceAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: ((tr: Transaction, state: import("prosemirror-state").EditorState) => Transaction) | undefined) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => FindReplacePluginState, createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: FindReplacePluginState | ((state: import("prosemirror-state").EditorState) => FindReplacePluginState)) => import("prosemirror-state").SafeStateField<FindReplacePluginState>;

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

@@ -3,6 +3,7 @@ import { type TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { CardPlugin } from '@atlaskit/editor-plugin-card';
+import type { ExpandPlugin } from '@atlaskit/editor-plugin-expand';
 import type { MentionsPlugin } from '@atlaskit/editor-plugin-mentions';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { FindReplacePluginState, FindReplaceToolbarButtonActionProps } from './types';
@@ -14,7 +15,8 @@ export type FindReplacePluginDependencies = [
     OptionalPlugin<AnalyticsPlugin>,
     OptionalPlugin<PrimaryToolbarPlugin>,
     OptionalPlugin<MentionsPlugin>,
-    OptionalPlugin<CardPlugin>
+    OptionalPlugin<CardPlugin>,
+    OptionalPlugin<ExpandPlugin>
 ];
 export type FindReplacePlugin = NextEditorPlugin<'findReplace', {
     pluginConfiguration: FindReplacePluginOptions;

package/dist/types-ts4.5/pm-plugins/commands-with-analytics.d.ts

@@ -9,10 +9,10 @@ export declare const findWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI
     containerElement: HTMLElement | null;
     keyword?: string | undefined;
 }) => Command;
-export declare const findNextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ triggerMethod, }: {
+export declare const findNextWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorView: EditorView) => ({ triggerMethod, }: {
     triggerMethod: TRIGGER_METHOD.KEYBOARD | TRIGGER_METHOD.BUTTON;
 }) => Command;
-export declare const findPrevWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ triggerMethod, }: {
+export declare const findPrevWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorView: EditorView) => ({ triggerMethod, }: {
     triggerMethod: TRIGGER_METHOD.KEYBOARD | TRIGGER_METHOD.BUTTON;
 }) => Command;
 export declare const replaceWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ triggerMethod, replaceText, }: {

package/dist/types-ts4.5/pm-plugins/commands.d.ts

@@ -1,8 +1,8 @@
 import type { Decoration, EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const activate: () => import("@atlaskit/editor-common/types").Command;
 export declare const find: (editorView: EditorView, containerElement: HTMLElement | null, keyword?: string) => import("@atlaskit/editor-common/types").Command;
-export declare const findNext: () => import("@atlaskit/editor-common/types").Command;
-export declare const findPrevious: () => import("@atlaskit/editor-common/types").Command;
+export declare const findNext: (editorView: EditorView) => import("@atlaskit/editor-common/types").Command;
+export declare const findPrevious: (editorView: EditorView) => import("@atlaskit/editor-common/types").Command;
 export declare const replace: (replaceText: string) => import("@atlaskit/editor-common/types").Command;
 export declare const replaceAll: (replaceText: string) => import("@atlaskit/editor-common/types").Command;
 export declare const addDecorations: (decorations: Decoration[]) => import("@atlaskit/editor-common/types").Command;

package/dist/types-ts4.5/pm-plugins/plugin-factory.d.ts

@@ -1,2 +1,3 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { FindReplacePluginState } from '../types';
-export declare const createCommand: <A = import("./actions").FindReplaceAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: ((tr: import("prosemirror-state").Transaction, state: import("prosemirror-state").EditorState) => import("prosemirror-state").Transaction) | undefined) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => FindReplacePluginState, createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: FindReplacePluginState | ((state: import("prosemirror-state").EditorState) => FindReplacePluginState)) => import("prosemirror-state").SafeStateField<FindReplacePluginState>;
+export declare const createCommand: <A = import("./actions").FindReplaceAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: ((tr: Transaction, state: import("prosemirror-state").EditorState) => Transaction) | undefined) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => FindReplacePluginState, createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: FindReplacePluginState | ((state: import("prosemirror-state").EditorState) => FindReplacePluginState)) => import("prosemirror-state").SafeStateField<FindReplacePluginState>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-find-replace",
-	"version": "3.0.2",
+	"version": "3.1.1",
 	"description": "find replace plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,6 +35,7 @@
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/editor-plugin-analytics": "^3.0.0",
 		"@atlaskit/editor-plugin-card": "^7.0.0",
+		"@atlaskit/editor-plugin-expand": "^4.1.0",
 		"@atlaskit/editor-plugin-mentions": "^5.1.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -46,8 +47,8 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.10.0",
 		"@atlaskit/textfield": "^8.0.0",
-		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.0.0",
+		"@atlaskit/theme": "^19.0.0",
+		"@atlaskit/tmp-editor-statsig": "^9.1.0",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",