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

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 3.0.2
+
+### Patch Changes
+
+- [#182839](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/182839)
+  [`81f1c3383bdab`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/81f1c3383bdab) -
+  refactor: use useSharedPluginStateWithSelector instead of useSharedPluginStateSelector
+- Updated dependencies
+
+## 3.0.1
+
+### Patch Changes
+
+- [#180340](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/180340)
+  [`3cf803e05d3b9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3cf803e05d3b9) -
+  [ux] ED-28366 set active match to closest match to selection rather than first following selection
+- Updated dependencies
+
 ## 3.0.0
 
 ### Major Changes

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.toggleMatchCase = exports.replaceAll = exports.replace = exports.removeDecorations = exports.findPrevious = exports.findNext = exports.find = exports.cancelSearch = exports.blur = exports.addDecorations = exports.activate = void 0;
 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 _actions = require("./actions");
 var _pluginFactory = require("./plugin-factory");
@@ -34,7 +35,7 @@ var activate = exports.activate = function activate() {
         getIntl: getIntl,
         api: api
       });
-      index = (0, _utils.findSearchIndex)(selection.from, matches);
+      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 {
       type: _actions.FindReplaceActionTypes.ACTIVATE,
@@ -58,7 +59,7 @@ var find = exports.find = function find(editorView, containerElement, keyword) {
       getIntl: getIntl,
       api: api
     }) : [];
-    var index = (0, _utils.findSearchIndex)(selection.from, matches);
+    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);
 
     // we can't just apply all the decorations to highlight the search results at once
     // as if there are a lot ProseMirror cries :'(
@@ -87,7 +88,7 @@ var find = exports.find = function find(editorView, containerElement, keyword) {
       api: api
     }) : [];
     if (matches.length > 0) {
-      var index = (0, _utils.findSearchIndex)(selection.from, matches);
+      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));
     }
     return tr;

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

@@ -9,6 +9,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 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 _main = require("./main");
 var _pluginKey = require("./plugin-key");
 var _reducer = _interopRequireDefault(require("./reducer"));
@@ -101,7 +103,7 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     });
   }
   if (newIndex === undefined || newIndex === -1) {
-    newIndex = (0, _utils2.findSearchIndex)(tr.selection.from, newMatches);
+    newIndex = (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_improvements_1') ? (0, _utils2.findClosestMatch)(tr.selection.from, newMatches) : (0, _utils2.findSearchIndex)(tr.selection.from, newMatches);
   }
   var newSelectedMatch = newMatches[newIndex];
   decorationSet = (0, _utils2.removeMatchesFromSet)(decorationSet, [selectedMatch, newSelectedMatch], tr.doc);

package/dist/cjs/pm-plugins/utils/index.js

@@ -4,7 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.findLostAdjacentDecorations = exports.findIndexBeforePosition = exports.findDecorationFromMatch = exports.createDecorations = exports.createDecoration = void 0;
+exports.createDecorations = exports.createDecoration = void 0;
+exports.findClosestMatch = findClosestMatch;
+exports.findLostAdjacentDecorations = exports.findIndexBeforePosition = exports.findDecorationFromMatch = void 0;
 exports.findMatches = findMatches;
 exports.findSearchIndex = findSearchIndex;
 exports.getSelectedText = getSelectedText;
@@ -247,6 +249,22 @@ function findMatches(_ref2) {
   }
   return matches;
 }
+function findClosestMatch(selectionPos, matches) {
+  var forwardMatchIndex = Math.max(matches.findIndex(function (match) {
+    return match.start >= selectionPos;
+  }), 0);
+  if (forwardMatchIndex === 0) {
+    return forwardMatchIndex;
+  }
+  var backwardMatchIndex = forwardMatchIndex - 1;
+  var forwardMatchPos = matches[forwardMatchIndex].start;
+  var backwardMatchPos = matches[backwardMatchIndex].end;
+  if (forwardMatchPos - selectionPos < selectionPos - backwardMatchPos) {
+    return forwardMatchIndex;
+  } else {
+    return backwardMatchIndex;
+  }
+}
 
 /**
  * Finds index of first item in matches array that comes after user's cursor pos.

package/dist/cjs/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -9,13 +9,11 @@ exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../pm-plugins/commands");
 var _commandsWithAnalytics = require("../pm-plugins/commands-with-analytics");
 var _FindReplaceDropdown = _interopRequireDefault(require("./FindReplaceDropdown"));
 var _FindReplaceToolbarButton = _interopRequireDefault(require("./FindReplaceToolbarButton"));
-var _useFindReplacePluginStateSelector = require("./hooks/useFindReplacePluginStateSelector");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 // light implementation of useSharedPluginState(). This is due to findreplace
 // being the only plugin that previously used WithPluginState with
@@ -42,36 +40,6 @@ var useSharedPluginStateNoDebounce = function useSharedPluginStateNoDebounce(api
     findReplaceState: state
   };
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
-  var shouldMatchCase = (0, _useFindReplacePluginStateSelector.useFindReplacePluginStateSelector)(api, 'shouldMatchCase');
-  var isActive = (0, _useFindReplacePluginStateSelector.useFindReplacePluginStateSelector)(api, 'isActive');
-  var findText = (0, _useFindReplacePluginStateSelector.useFindReplacePluginStateSelector)(api, 'findText');
-  var replaceText = (0, _useFindReplacePluginStateSelector.useFindReplacePluginStateSelector)(api, 'replaceText');
-  var index = (0, _useFindReplacePluginStateSelector.useFindReplacePluginStateSelector)(api, 'index');
-  var matches = (0, _useFindReplacePluginStateSelector.useFindReplacePluginStateSelector)(api, 'matches');
-  var shouldFocus = (0, _useFindReplacePluginStateSelector.useFindReplacePluginStateSelector)(api, 'shouldFocus');
-  return {
-    shouldMatchCase: shouldMatchCase,
-    isActive: isActive,
-    findText: findText,
-    replaceText: replaceText,
-    index: index,
-    matches: matches,
-    shouldFocus: shouldFocus
-  };
-}, function (api) {
-  var _useSharedPluginState = useSharedPluginStateNoDebounce(api),
-    findReplaceState = _useSharedPluginState.findReplaceState;
-  return {
-    shouldMatchCase: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldMatchCase,
-    isActive: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.isActive,
-    findText: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.findText,
-    replaceText: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.replaceText,
-    index: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.index,
-    matches: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.matches,
-    shouldFocus: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldFocus
-  };
-});
 var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(_ref2) {
   var _api$analytics, _matches$index;
   var popupsBoundariesElement = _ref2.popupsBoundariesElement,
@@ -86,14 +54,15 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     isButtonHidden = _ref2.isButtonHidden,
     doesNotHaveButton = _ref2.doesNotHaveButton;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
-  var _useSharedState = useSharedState(api),
-    shouldMatchCase = _useSharedState.shouldMatchCase,
-    isActive = _useSharedState.isActive,
-    findText = _useSharedState.findText,
-    replaceText = _useSharedState.replaceText,
-    index = _useSharedState.index,
-    matches = _useSharedState.matches,
-    shouldFocus = _useSharedState.shouldFocus;
+  var _useSharedPluginState = useSharedPluginStateNoDebounce(api),
+    findReplaceState = _useSharedPluginState.findReplaceState;
+  var shouldMatchCase = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldMatchCase;
+  var isActive = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.isActive;
+  var findText = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.findText;
+  var replaceText = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.replaceText;
+  var index = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.index;
+  var matches = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.matches;
+  var shouldFocus = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldFocus;
   if (!editorView) {
     return null;
   }

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

@@ -1,9 +1,10 @@
 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 { FindReplaceActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
-import { createDecoration, findDecorationFromMatch, findMatches, findSearchIndex, getSelectedText, getSelectionForMatch, nextIndex, prevIndex, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
+import { createDecoration, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, getSelectedText, getSelectionForMatch, nextIndex, prevIndex, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
 import batchDecorations from './utils/batch-decorations';
 import { withScrollIntoView } from './utils/commands';
 export const activate = () => createCommand(state => {
@@ -29,7 +30,7 @@ export const activate = () => createCommand(state => {
       getIntl,
       api
     });
-    index = findSearchIndex(selection.from, matches);
+    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 {
     type: FindReplaceActionTypes.ACTIVATE,
@@ -54,7 +55,7 @@ export const find = (editorView, containerElement, keyword) => withScrollIntoVie
     getIntl,
     api
   }) : [];
-  const index = findSearchIndex(selection.from, matches);
+  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);
 
   // we can't just apply all the decorations to highlight the search results at once
   // as if there are a lot ProseMirror cries :'(
@@ -82,7 +83,7 @@ export const find = (editorView, containerElement, keyword) => withScrollIntoVie
     api
   }) : [];
   if (matches.length > 0) {
-    const index = findSearchIndex(selection.from, matches);
+    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));
   }
   return tr;

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

@@ -1,9 +1,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 { initialState } from './main';
 import { findReplacePluginKey } from './plugin-key';
 import reducer from './reducer';
-import { createDecorations, findDecorationFromMatch, findMatches, findSearchIndex, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
+import { createDecorations, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
 import { findUniqueItemsIn } from './utils/array'; // TODO: ED-26959 - move into index export
 
 const handleDocChanged = (tr, pluginState) => {
@@ -81,7 +83,7 @@ const handleDocChanged = (tr, pluginState) => {
     newIndex = newMatches.findIndex(match => match.start === selectedMatch.start);
   }
   if (newIndex === undefined || newIndex === -1) {
-    newIndex = findSearchIndex(tr.selection.from, newMatches);
+    newIndex = expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_and_replace_improvements_1') ? findClosestMatch(tr.selection.from, newMatches) : findSearchIndex(tr.selection.from, newMatches);
   }
   const newSelectedMatch = newMatches[newIndex];
   decorationSet = removeMatchesFromSet(decorationSet, [selectedMatch, newSelectedMatch], tr.doc);

package/dist/es2019/pm-plugins/utils/index.js

@@ -246,6 +246,20 @@ export function findMatches({
   }
   return matches;
 }
+export function findClosestMatch(selectionPos, matches) {
+  const forwardMatchIndex = Math.max(matches.findIndex(match => match.start >= selectionPos), 0);
+  if (forwardMatchIndex === 0) {
+    return forwardMatchIndex;
+  }
+  const backwardMatchIndex = forwardMatchIndex - 1;
+  const forwardMatchPos = matches[forwardMatchIndex].start;
+  const backwardMatchPos = matches[backwardMatchIndex].end;
+  if (forwardMatchPos - selectionPos < selectionPos - backwardMatchPos) {
+    return forwardMatchIndex;
+  } else {
+    return backwardMatchIndex;
+  }
+}
 
 /**
  * Finds index of first item in matches array that comes after user's cursor pos.

package/dist/es2019/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -1,12 +1,10 @@
 import React, { useLayoutEffect, useState } from 'react';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory } from '@atlaskit/editor-common/hooks';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { blur, toggleMatchCase } from '../pm-plugins/commands';
 import { activateWithAnalytics, cancelSearchWithAnalytics, findNextWithAnalytics, findPrevWithAnalytics, findWithAnalytics, replaceAllWithAnalytics, replaceWithAnalytics } from '../pm-plugins/commands-with-analytics';
 import FindReplaceDropdown from './FindReplaceDropdown';
 import FindReplaceToolbarButton from './FindReplaceToolbarButton';
-import { useFindReplacePluginStateSelector } from './hooks/useFindReplacePluginStateSelector';
 
 // light implementation of useSharedPluginState(). This is due to findreplace
 // being the only plugin that previously used WithPluginState with
@@ -31,37 +29,6 @@ const useSharedPluginStateNoDebounce = api => {
     findReplaceState: state
   };
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(api => {
-  const shouldMatchCase = useFindReplacePluginStateSelector(api, 'shouldMatchCase');
-  const isActive = useFindReplacePluginStateSelector(api, 'isActive');
-  const findText = useFindReplacePluginStateSelector(api, 'findText');
-  const replaceText = useFindReplacePluginStateSelector(api, 'replaceText');
-  const index = useFindReplacePluginStateSelector(api, 'index');
-  const matches = useFindReplacePluginStateSelector(api, 'matches');
-  const shouldFocus = useFindReplacePluginStateSelector(api, 'shouldFocus');
-  return {
-    shouldMatchCase,
-    isActive,
-    findText,
-    replaceText,
-    index,
-    matches,
-    shouldFocus
-  };
-}, api => {
-  const {
-    findReplaceState
-  } = useSharedPluginStateNoDebounce(api);
-  return {
-    shouldMatchCase: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldMatchCase,
-    isActive: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.isActive,
-    findText: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.findText,
-    replaceText: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.replaceText,
-    index: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.index,
-    matches: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.matches,
-    shouldFocus: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldFocus
-  };
-});
 const FindReplaceToolbarButtonWithState = ({
   popupsBoundariesElement,
   popupsMountPoint,
@@ -78,14 +45,15 @@ const FindReplaceToolbarButtonWithState = ({
   var _api$analytics, _matches$index;
   const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   const {
-    shouldMatchCase,
-    isActive,
-    findText,
-    replaceText,
-    index,
-    matches,
-    shouldFocus
-  } = useSharedState(api);
+    findReplaceState
+  } = useSharedPluginStateNoDebounce(api);
+  const shouldMatchCase = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldMatchCase;
+  const isActive = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.isActive;
+  const findText = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.findText;
+  const replaceText = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.replaceText;
+  const index = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.index;
+  const matches = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.matches;
+  const shouldFocus = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldFocus;
   if (!editorView) {
     return null;
   }

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

@@ -1,9 +1,10 @@
 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 { FindReplaceActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
-import { createDecoration, findDecorationFromMatch, findMatches, findSearchIndex, getSelectedText, getSelectionForMatch, nextIndex, prevIndex, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
+import { createDecoration, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, getSelectedText, getSelectionForMatch, nextIndex, prevIndex, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
 import batchDecorations from './utils/batch-decorations';
 import { withScrollIntoView } from './utils/commands';
 export var activate = function activate() {
@@ -27,7 +28,7 @@ export var activate = function activate() {
         getIntl: getIntl,
         api: api
       });
-      index = findSearchIndex(selection.from, matches);
+      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 {
       type: FindReplaceActionTypes.ACTIVATE,
@@ -51,7 +52,7 @@ export var find = function find(editorView, containerElement, keyword) {
       getIntl: getIntl,
       api: api
     }) : [];
-    var index = findSearchIndex(selection.from, matches);
+    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);
 
     // we can't just apply all the decorations to highlight the search results at once
     // as if there are a lot ProseMirror cries :'(
@@ -80,7 +81,7 @@ export var find = function find(editorView, containerElement, keyword) {
       api: api
     }) : [];
     if (matches.length > 0) {
-      var index = findSearchIndex(selection.from, matches);
+      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));
     }
     return tr;

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

@@ -4,10 +4,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 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 { initialState } from './main';
 import { findReplacePluginKey } from './plugin-key';
 import reducer from './reducer';
-import { createDecorations, findDecorationFromMatch, findMatches, findSearchIndex, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
+import { createDecorations, findClosestMatch, findDecorationFromMatch, findMatches, findSearchIndex, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
 import { findUniqueItemsIn } from './utils/array'; // TODO: ED-26959 - move into index export
 
 var handleDocChanged = function handleDocChanged(tr, pluginState) {
@@ -93,7 +95,7 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     });
   }
   if (newIndex === undefined || newIndex === -1) {
-    newIndex = findSearchIndex(tr.selection.from, newMatches);
+    newIndex = expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_and_replace_improvements_1') ? findClosestMatch(tr.selection.from, newMatches) : findSearchIndex(tr.selection.from, newMatches);
   }
   var newSelectedMatch = newMatches[newIndex];
   decorationSet = removeMatchesFromSet(decorationSet, [selectedMatch, newSelectedMatch], tr.doc);

package/dist/esm/pm-plugins/utils/index.js

@@ -236,6 +236,22 @@ export function findMatches(_ref2) {
   }
   return matches;
 }
+export function findClosestMatch(selectionPos, matches) {
+  var forwardMatchIndex = Math.max(matches.findIndex(function (match) {
+    return match.start >= selectionPos;
+  }), 0);
+  if (forwardMatchIndex === 0) {
+    return forwardMatchIndex;
+  }
+  var backwardMatchIndex = forwardMatchIndex - 1;
+  var forwardMatchPos = matches[forwardMatchIndex].start;
+  var backwardMatchPos = matches[backwardMatchIndex].end;
+  if (forwardMatchPos - selectionPos < selectionPos - backwardMatchPos) {
+    return forwardMatchIndex;
+  } else {
+    return backwardMatchIndex;
+  }
+}
 
 /**
  * Finds index of first item in matches array that comes after user's cursor pos.

package/dist/esm/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -1,13 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useLayoutEffect, useState } from 'react';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
-import { sharedPluginStateHookMigratorFactory } from '@atlaskit/editor-common/hooks';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { blur, toggleMatchCase } from '../pm-plugins/commands';
 import { activateWithAnalytics, cancelSearchWithAnalytics, findNextWithAnalytics, findPrevWithAnalytics, findWithAnalytics, replaceAllWithAnalytics, replaceWithAnalytics } from '../pm-plugins/commands-with-analytics';
 import FindReplaceDropdown from './FindReplaceDropdown';
 import FindReplaceToolbarButton from './FindReplaceToolbarButton';
-import { useFindReplacePluginStateSelector } from './hooks/useFindReplacePluginStateSelector';
 
 // light implementation of useSharedPluginState(). This is due to findreplace
 // being the only plugin that previously used WithPluginState with
@@ -34,36 +32,6 @@ var useSharedPluginStateNoDebounce = function useSharedPluginStateNoDebounce(api
     findReplaceState: state
   };
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
-  var shouldMatchCase = useFindReplacePluginStateSelector(api, 'shouldMatchCase');
-  var isActive = useFindReplacePluginStateSelector(api, 'isActive');
-  var findText = useFindReplacePluginStateSelector(api, 'findText');
-  var replaceText = useFindReplacePluginStateSelector(api, 'replaceText');
-  var index = useFindReplacePluginStateSelector(api, 'index');
-  var matches = useFindReplacePluginStateSelector(api, 'matches');
-  var shouldFocus = useFindReplacePluginStateSelector(api, 'shouldFocus');
-  return {
-    shouldMatchCase: shouldMatchCase,
-    isActive: isActive,
-    findText: findText,
-    replaceText: replaceText,
-    index: index,
-    matches: matches,
-    shouldFocus: shouldFocus
-  };
-}, function (api) {
-  var _useSharedPluginState = useSharedPluginStateNoDebounce(api),
-    findReplaceState = _useSharedPluginState.findReplaceState;
-  return {
-    shouldMatchCase: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldMatchCase,
-    isActive: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.isActive,
-    findText: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.findText,
-    replaceText: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.replaceText,
-    index: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.index,
-    matches: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.matches,
-    shouldFocus: findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldFocus
-  };
-});
 var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(_ref2) {
   var _api$analytics, _matches$index;
   var popupsBoundariesElement = _ref2.popupsBoundariesElement,
@@ -78,14 +46,15 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     isButtonHidden = _ref2.isButtonHidden,
     doesNotHaveButton = _ref2.doesNotHaveButton;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
-  var _useSharedState = useSharedState(api),
-    shouldMatchCase = _useSharedState.shouldMatchCase,
-    isActive = _useSharedState.isActive,
-    findText = _useSharedState.findText,
-    replaceText = _useSharedState.replaceText,
-    index = _useSharedState.index,
-    matches = _useSharedState.matches,
-    shouldFocus = _useSharedState.shouldFocus;
+  var _useSharedPluginState = useSharedPluginStateNoDebounce(api),
+    findReplaceState = _useSharedPluginState.findReplaceState;
+  var shouldMatchCase = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldMatchCase;
+  var isActive = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.isActive;
+  var findText = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.findText;
+  var replaceText = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.replaceText;
+  var index = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.index;
+  var matches = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.matches;
+  var shouldFocus = findReplaceState === null || findReplaceState === void 0 ? void 0 : findReplaceState.shouldFocus;
   if (!editorView) {
     return null;
   }

package/dist/types/pm-plugins/utils/index.d.ts

@@ -20,6 +20,7 @@ type FindMatchesType = {
     api?: ExtractInjectionAPI<FindReplacePlugin>;
 };
 export declare function findMatches({ content, searchText, shouldMatchCase, contentIndex, getIntl, api, }: FindMatchesType): Match[];
+export declare function findClosestMatch(selectionPos: number, matches: Match[]): number;
 /**
  * Finds index of first item in matches array that comes after user's cursor pos.
  * If `backward` is `true`, finds index of first item that comes before instead.

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

@@ -20,6 +20,7 @@ type FindMatchesType = {
     api?: ExtractInjectionAPI<FindReplacePlugin>;
 };
 export declare function findMatches({ content, searchText, shouldMatchCase, contentIndex, getIntl, api, }: FindMatchesType): Match[];
+export declare function findClosestMatch(selectionPos: number, matches: Match[]): number;
 /**
  * Finds index of first item in matches array that comes after user's cursor pos.
  * If `backward` is `true`, finds index of first item that comes before instead.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-find-replace",
-	"version": "3.0.0",
+	"version": "3.0.2",
 	"description": "find replace plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,19 +35,19 @@
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/editor-plugin-analytics": "^3.0.0",
 		"@atlaskit/editor-plugin-card": "^7.0.0",
-		"@atlaskit/editor-plugin-mentions": "^5.0.0",
+		"@atlaskit/editor-plugin-mentions": "^5.1.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/form": "^12.0.0",
-		"@atlaskit/icon": "^27.2.0",
+		"@atlaskit/icon": "^27.3.0",
 		"@atlaskit/icon-lab": "^5.1.0",
 		"@atlaskit/mention": "^24.2.0",
 		"@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": "^8.7.0",
+		"@atlaskit/tmp-editor-statsig": "^9.0.0",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"react-dom": "^18.2.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.6.0",
+		"@atlaskit/editor-common": "^107.7.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},