@atlaskit/editor-plugin-find-replace 2.7.1 → 2.8.0

package/dist/es2019/pm-plugins/utils/batch-decorations.js

@@ -1,3 +1,4 @@
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getPluginState } from '../plugin-factory';
 import { createDecorations, findDecorationFromMatch } from './index';
 
@@ -134,7 +135,7 @@ class BatchDecorations {
     return {
       viewportStartPos,
       viewportEndPos,
-      startPos: 1,
+      startPos: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? 0 : 1,
       endPos: editorView.state.doc.nodeSize
     };
   }
@@ -143,7 +144,11 @@ class BatchDecorations {
       top: y,
       left: x
     });
-    return startPos ? startPos.pos : 1;
+    if (expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+      return startPos ? startPos.pos : 0;
+    } else {
+      return startPos ? startPos.pos : 1;
+    }
   }
   getEndPos(editorView, y, x) {
     const maxPos = editorView.state.doc.nodeSize;

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

@@ -1,10 +1,12 @@
+import classnames from 'classnames';
 import { timestampToString } from '@atlaskit/editor-common/utils';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
 import { isPromise, MentionNameStatus } from '@atlaskit/mention/types';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { searchMatchClass, selectedSearchMatchClass } from '../../ui/styles';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { getGlobalTheme } from '@atlaskit/tokens';
+import { searchMatchClass, selectedSearchMatchClass, blockSearchMatchClass, darkModeSearchMatchClass } from '../../ui/styles';
 export function getSelectedText(selection) {
   let text = '';
   const selectedContent = selection.content().content;
@@ -15,16 +17,38 @@ export function getSelectedText(selection) {
 }
 export const createDecorations = (selectedIndex, matches) => matches.map(({
   start,
-  end
-}, i) => createDecoration(start, end, i === selectedIndex));
-export const createDecoration = (start, end, isSelected) => {
-  let className = searchMatchClass;
-  if (isSelected) {
-    className += ` ${selectedSearchMatchClass}`;
+  end,
+  nodeType
+}, i) => createDecoration(start, end, i === selectedIndex, nodeType));
+const isBlock = nodeType => nodeType === 'blockCard' || nodeType === 'embedCard';
+export const createDecoration = (start, end, isSelected, nodeType) => {
+  if (expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+    const {
+      colorMode
+    } = getGlobalTheme();
+    const className = classnames(searchMatchClass, {
+      [selectedSearchMatchClass]: isSelected,
+      [blockSearchMatchClass]: isBlock(nodeType),
+      [darkModeSearchMatchClass]: colorMode === 'dark'
+    });
+    if (isBlock(nodeType)) {
+      return Decoration.node(start, end, {
+        class: className
+      });
+    } else {
+      return Decoration.inline(start, end, {
+        class: className
+      });
+    }
+  } else {
+    let className = searchMatchClass;
+    if (isSelected) {
+      className += ` ${selectedSearchMatchClass}`;
+    }
+    return Decoration.inline(start, end, {
+      class: className
+    });
   }
-  return Decoration.inline(start, end, {
-    class: className
-  });
 };
 export function findMatches({
   content,
@@ -60,7 +84,8 @@ export function findMatches({
       matches.push({
         start: pos + index,
         end: pos + end,
-        canReplace: fg('platform_editor_find_and_replace_1') ? true : undefined
+        canReplace: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? true : undefined,
+        nodeType: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? 'text' : undefined
       });
       index = text.indexOf(searchText, end);
     }
@@ -75,14 +100,8 @@ export function findMatches({
     let {
       text
     } = textGrouping;
-    // status text is rendered in all caps regardless so case matching should work if the search text is all caps
-    if (fg('platform_editor_find_and_replace_part_2')) {
-      if (shouldMatchCase) {
-        text = text.toUpperCase();
-      } else {
-        text = text.toLowerCase();
-        searchText = searchText.toLowerCase();
-      }
+    if (shouldMatchCase) {
+      text = text.toUpperCase();
     } else {
       text = text.toLowerCase();
       searchText = searchText.toLowerCase();
@@ -93,11 +112,12 @@ export function findMatches({
       matches.push({
         start,
         end: start + nodeSize,
-        canReplace: false
+        canReplace: false,
+        nodeType: 'status'
       });
     }
   };
-  const collectDateOrMentionMatch = (textGrouping, nodeSize) => {
+  const collectNodeMatch = (textGrouping, node) => {
     if (!textGrouping) {
       return;
     }
@@ -116,11 +136,37 @@ export function findMatches({
       const start = pos;
       matches.push({
         start,
-        end: start + nodeSize,
-        canReplace: false
+        end: start + node.nodeSize,
+        canReplace: false,
+        nodeType: node.type.name
       });
     }
   };
+  const collectCardTitleMatch = (node, pos) => {
+    var _api$card, _api$card$sharedState;
+    const cards = api === null || api === void 0 ? void 0 : (_api$card = api.card) === null || _api$card === void 0 ? void 0 : (_api$card$sharedState = _api$card.sharedState.currentState()) === null || _api$card$sharedState === void 0 ? void 0 : _api$card$sharedState.cards;
+    if (cards) {
+      const relevantCard = cards.find(card => card.url === node.attrs.url);
+      const title = relevantCard === null || relevantCard === void 0 ? void 0 : relevantCard.title;
+      if (relevantCard) {
+        if (title) {
+          collectNodeMatch({
+            text: title,
+            pos
+          }, node);
+        } else {
+          // when there is no title, e.g. in an error case like unauthorized
+          // the link card just shows the entire url as the title in inline card
+          if (node.type.name === 'inlineCard') {
+            collectNodeMatch({
+              text: node.attrs.url,
+              pos
+            }, node);
+          }
+        }
+      }
+    }
+  };
   if (searchTextLength > 0) {
     content.descendants((node, pos) => {
       if (node.isText) {
@@ -135,7 +181,7 @@ export function findMatches({
       } else {
         collectTextMatch(textGrouping);
         textGrouping = null;
-        if (fg('platform_editor_find_and_replace_1')) {
+        if (expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
           switch (node.type.name) {
             case 'status':
               collectStatusMatch({
@@ -144,43 +190,44 @@ export function findMatches({
               }, node.nodeSize);
               break;
             case 'date':
-              if (fg('platform_editor_find_and_replace_part_2')) {
-                collectDateOrMentionMatch({
-                  text: timestampToString(node.attrs.timestamp, getIntl ? getIntl() : null),
-                  pos
-                }, node.nodeSize);
-              }
+              collectNodeMatch({
+                text: timestampToString(node.attrs.timestamp, getIntl ? getIntl() : null),
+                pos
+              }, node);
               break;
             case 'mention':
-              if (fg('platform_editor_find_and_replace_part_2')) {
-                let text;
-                if (node.attrs.text) {
-                  text = node.attrs.text;
-                } else {
-                  var _api$mention, _api$mention$sharedSt;
-                  // the text may be sanitised from the node for privacy reasons
-                  // so we need to use the mentionProvider to resolve it
-                  const mentionProvider = api === null || api === void 0 ? void 0 : (_api$mention = api.mention) === null || _api$mention === void 0 ? void 0 : (_api$mention$sharedSt = _api$mention.sharedState.currentState()) === null || _api$mention$sharedSt === void 0 ? void 0 : _api$mention$sharedSt.mentionProvider;
-                  if (isResolvingMentionProvider(mentionProvider)) {
-                    const nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
-                    if (isPromise(nameDetail)) {
-                      text = '@...';
+              let text;
+              if (node.attrs.text) {
+                text = node.attrs.text;
+              } else {
+                var _api$mention, _api$mention$sharedSt;
+                // the text may be sanitised from the node for privacy reasons
+                // so we need to use the mentionProvider to resolve it
+                const mentionProvider = api === null || api === void 0 ? void 0 : (_api$mention = api.mention) === null || _api$mention === void 0 ? void 0 : (_api$mention$sharedSt = _api$mention.sharedState.currentState()) === null || _api$mention$sharedSt === void 0 ? void 0 : _api$mention$sharedSt.mentionProvider;
+                if (isResolvingMentionProvider(mentionProvider)) {
+                  const nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
+                  if (isPromise(nameDetail)) {
+                    text = '@...';
+                  } else {
+                    if (nameDetail.status === MentionNameStatus.OK) {
+                      text = `@${nameDetail.name || ''}`;
                     } else {
-                      if (nameDetail.status === MentionNameStatus.OK) {
-                        text = `@${nameDetail.name || ''}`;
-                      } else {
-                        text = '@_|unknown|_';
-                      }
+                      text = '@_|unknown|_';
                     }
                   }
                 }
-                if (text) {
-                  collectDateOrMentionMatch({
-                    text,
-                    pos
-                  }, node.nodeSize);
-                }
               }
+              if (text) {
+                collectNodeMatch({
+                  text,
+                  pos
+                }, node);
+              }
+              break;
+            case 'inlineCard':
+            case 'blockCard':
+            case 'embedCard':
+              collectCardTitleMatch(node, pos);
               break;
             default:
               break;

package/dist/es2019/ui/FindReplace.js

@@ -10,6 +10,7 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Find from './Find';
 import Replace from './Replace';
 import ReplaceNext from './ReplaceNext';
@@ -126,7 +127,7 @@ class FindReplace extends React.PureComponent {
         css: ruleStyles,
         id: "replace-hr-element"
       }), fg('editor_a11y_refactor_find_replace_style') ? jsx(ReplaceNext, {
-        canReplace: fg('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
+        canReplace: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? !!isReplaceable : count.total > 0,
         replaceText: replaceText,
         onReplace: onReplace,
         onReplaceAll: onReplaceAll,
@@ -141,7 +142,7 @@ class FindReplace extends React.PureComponent {
         setFindTyped: this.setFindTyped,
         focusToolbarButton: focusToolbarButton
       }) : jsx(Replace, {
-        canReplace: fg('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
+        canReplace: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? !!isReplaceable : count.total > 0,
         replaceText: replaceText,
         onReplace: onReplace,
         onReplaceAll: onReplaceAll,

package/dist/es2019/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -1,7 +1,7 @@
 import React, { useLayoutEffect, useState } from 'react';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { sharedPluginStateHookMigratorFactory } from '@atlaskit/editor-common/hooks';
-import { fg } from '@atlaskit/platform-feature-flags';
+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';
@@ -173,8 +173,8 @@ const FindReplaceToolbarButtonWithState = ({
     findText: findText,
     index: index,
     numMatches: matches.length,
-    isReplaceable: fg('platform_editor_find_and_replace_1') ? (_matches$index = matches[index]) === null || _matches$index === void 0 ? void 0 : _matches$index.canReplace : undefined,
-    numReplaceable: fg('platform_editor_find_and_replace_1') ? matches.filter(match => match.canReplace === true).length : undefined,
+    isReplaceable: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? (_matches$index = matches[index]) === null || _matches$index === void 0 ? void 0 : _matches$index.canReplace : undefined,
+    numReplaceable: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? matches.filter(match => match.canReplace === true).length : undefined,
     replaceText: replaceText,
     shouldFocus: shouldFocus,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/es2019/ui/Replace.js

@@ -15,9 +15,9 @@ import { findReplaceMessages as messages } from '@atlaskit/editor-common/message
 import { Label, ValidMessage } from '@atlaskit/form';
 import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down--hipchat-chevron-down';
 import ChevronUpIcon from '@atlaskit/icon/core/migration/chevron-up--hipchat-chevron-up';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Inline, xcss } from '@atlaskit/primitives';
 import Textfield from '@atlaskit/textfield';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
 import { nextPreviousItemStyles, orderOneStyles, orderZeroStyles, sectionWrapperJustified, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './ui-styles';
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -83,7 +83,7 @@ class Replace extends React.PureComponent {
       this.setState({
         isHelperMessageVisible: true
       });
-      if (this.props.count.totalReplaceable && fg('platform_editor_find_and_replace_1')) {
+      if (this.props.count.totalReplaceable && expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
         this.triggerSuccessReplacementMessageUpdate(this.props.count.totalReplaceable);
         this.setState({
           replaceCount: this.props.count.totalReplaceable
@@ -279,7 +279,7 @@ class Replace extends React.PureComponent {
       testId: this.replaceAll,
       id: "replaceAll-button",
       onClick: this.handleReplaceAllClick,
-      isDisabled: fg('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
+      isDisabled: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? count.totalReplaceable === 0 : !canReplace
     }, this.replaceAll))), jsx("div", {
       css: orderZeroStyles
     }, jsx(Button, {

package/dist/es2019/ui/ReplaceNext.js

@@ -6,9 +6,9 @@ import { findReplaceMessages as messages } from '@atlaskit/editor-common/message
 import { ValidMessage } from '@atlaskit/form';
 import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down--hipchat-chevron-down';
 import ChevronUpIcon from '@atlaskit/icon/core/migration/chevron-up--hipchat-chevron-up';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Inline, Text, xcss } from '@atlaskit/primitives';
 import Textfield from '@atlaskit/textfield';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
 const replaceContainerStyles = xcss({
   padding: 'space.100'
@@ -115,7 +115,7 @@ const Replace = ({
       replaceText
     });
     setIsHelperMessageVisible(true);
-    if (count.totalReplaceable && fg('platform_editor_find_and_replace_1')) {
+    if (count.totalReplaceable && expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
       triggerSuccessReplacementMessageUpdate(count.totalReplaceable);
       setReplaceCount(count.totalReplaceable);
     } else {
@@ -215,7 +215,7 @@ const Replace = ({
     testId: replaceAll,
     id: "replaceAll-button",
     onClick: handleReplaceAllClick,
-    isDisabled: fg('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
+    isDisabled: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? count.totalReplaceable === 0 : !canReplace
   }, replaceAll)), /*#__PURE__*/React.createElement(Button, {
     appearance: "subtle",
     testId: closeFindReplaceDialog,

package/dist/es2019/ui/styles.js

@@ -9,6 +9,8 @@ import { css } from '@emotion/react';
 import { N40A, N50A, N60A } from '@atlaskit/theme/colors';
 export const searchMatchClass = 'search-match';
 export const selectedSearchMatchClass = 'selected-search-match';
+export const blockSearchMatchClass = 'search-match-block';
+export const darkModeSearchMatchClass = 'search-match-dark';
 export const findReplaceStyles = css({
   [`.${searchMatchClass}`]: {
     borderRadius: '3px',
@@ -18,4 +20,101 @@ export const findReplaceStyles = css({
   [`.${selectedSearchMatchClass}`]: {
     backgroundColor: "var(--ds-background-accent-teal-subtle, #6CC3E0)"
   }
+});
+export const findReplaceStylesNew = css({
+  /** Text match styles */
+  [`.${searchMatchClass}`]: {
+    borderRadius: '3px',
+    backgroundColor: "var(--ds-background-accent-teal-subtlest, #E7F9FF)",
+    boxShadow: `${"var(--ds-shadow-raised, 0 1px 1px 0 rgba(9, 30, 66, 0.25), 0 0 1px 0 rgba(9, 30, 66, 0.31))"}, inset 0 0 0 1px ${"var(--ds-border-input, #8590A2)"}`
+  },
+  [`.${selectedSearchMatchClass}`]: {
+    backgroundColor: "var(--ds-background-accent-teal-subtle, #6CC3E0)"
+  },
+  /** Block match styles */
+
+  /** Light mode */
+
+  /** Without node selection */
+  [`.${blockSearchMatchClass}`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"},
+			inset 0 0 0 5px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"}
+			`
+    }
+  },
+  [`.${selectedSearchMatchClass}.${blockSearchMatchClass}`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"},
+			inset 0 0 0 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"}
+			`
+    }
+  },
+  /** With node selection */
+  [`.${blockSearchMatchClass}.ak-editor-selected-node`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"},
+			inset 0 0 0 5px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"},
+			0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
+			`
+    }
+  },
+  [`.${selectedSearchMatchClass}.${blockSearchMatchClass}.ak-editor-selected-node`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"},
+			inset 0 0 0 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"},
+			0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
+			`
+    }
+  },
+  /** Dark mode */
+
+  /** Without node selection */
+  [`.${blockSearchMatchClass}.${darkModeSearchMatchClass}`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-bolder, #946F00)"},
+			inset 0 0 0 5px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"}
+			`
+    }
+  },
+  [`.${selectedSearchMatchClass}.${blockSearchMatchClass}.${darkModeSearchMatchClass}`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-bolder, #946F00)"},
+			inset 0 0 0 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"}
+			`
+    }
+  },
+  /** With node selection */
+  [`.${blockSearchMatchClass}.${darkModeSearchMatchClass}.ak-editor-selected-node`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-bolder, #946F00)"},
+			inset 0 0 0 5px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"},
+			0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
+			`
+    }
+  },
+  [`.${selectedSearchMatchClass}.${blockSearchMatchClass}.${darkModeSearchMatchClass}.ak-editor-selected-node`]: {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+      boxShadow: `
+			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-bolder, #946F00)"},
+			inset 0 0 0 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"},
+			0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
+			`
+    }
+  }
 });

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

@@ -1,6 +1,6 @@
 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';
@@ -171,7 +171,7 @@ export var replace = function replace(replaceText) {
       index = _getPluginState6.index,
       findText = _getPluginState6.findText;
     if (matches[index]) {
-      if (!matches[index].canReplace && fg('platform_editor_find_and_replace_1')) {
+      if (!matches[index].canReplace && expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
         return tr;
       }
       var _matches$index = matches[index],
@@ -193,7 +193,7 @@ export var replaceAll = function replaceAll(replaceText) {
   }, function (tr, state) {
     var pluginState = getPluginState(state);
     pluginState.matches.forEach(function (match) {
-      if (!match.canReplace && fg('platform_editor_find_and_replace_1')) {
+      if (!match.canReplace && expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
         return tr;
       }
       tr.insertText(replaceText, tr.mapping.map(match.start), tr.mapping.map(match.end));
@@ -271,10 +271,10 @@ var updateSelectedHighlight = function updateSelectedHighlight(state, nextSelect
     decorationSet = removeDecorationsFromSet(decorationSet, decorationsToRemove, state.doc);
   }
   if (currentSelectedMatch) {
-    decorationSet = decorationSet.add(state.doc, [createDecoration(currentSelectedMatch.start, currentSelectedMatch.end)]);
+    decorationSet = decorationSet.add(state.doc, [createDecoration(currentSelectedMatch.start, currentSelectedMatch.end, false, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? currentSelectedMatch.nodeType : undefined)]);
   }
   if (nextSelectedMatch) {
-    decorationSet = decorationSet.add(state.doc, [createDecoration(nextSelectedMatch.start, nextSelectedMatch.end, true)]);
+    decorationSet = decorationSet.add(state.doc, [createDecoration(nextSelectedMatch.start, nextSelectedMatch.end, true, expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? nextSelectedMatch.nodeType : undefined)]);
   }
   return decorationSet;
 };

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

@@ -3,7 +3,7 @@ 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 { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 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 { createPluginState, getPluginState } from './plugin-factory';
 import { findReplacePluginKey } from './plugin-key';
 export var initialState = {
@@ -20,7 +20,7 @@ export var createPlugin = function createPlugin(dispatch, getIntl, api) {
   return new SafePlugin({
     key: findReplacePluginKey,
     state: createPluginState(dispatch, function () {
-      return fg('platform_editor_find_and_replace_part_2') ? _objectSpread(_objectSpread({}, initialState), {}, {
+      return expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? _objectSpread(_objectSpread({}, initialState), {}, {
         getIntl: getIntl,
         api: api
       }) : _objectSpread({}, initialState);

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

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _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 { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { FindReplaceActionTypes } from './actions';
 var reducer = function reducer(getInitialState) {
   return function (state, action) {
@@ -40,7 +40,7 @@ var reducer = function reducer(getInitialState) {
       case FindReplaceActionTypes.CANCEL:
         var getIntl = state.getIntl,
           api = state.api;
-        return fg('platform_editor_find_and_replace_part_2') ? _objectSpread(_objectSpread({}, getInitialState()), {}, {
+        return expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? _objectSpread(_objectSpread({}, getInitialState()), {}, {
           getIntl: getIntl,
           api: api
         }) : getInitialState();

package/dist/esm/pm-plugins/utils/batch-decorations.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getPluginState } from '../plugin-factory';
 import { createDecorations, findDecorationFromMatch } from './index';
 
@@ -242,7 +243,7 @@ var BatchDecorations = /*#__PURE__*/function () {
       return {
         viewportStartPos: viewportStartPos,
         viewportEndPos: viewportEndPos,
-        startPos: 1,
+        startPos: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? 0 : 1,
         endPos: editorView.state.doc.nodeSize
       };
     }
@@ -253,7 +254,11 @@ var BatchDecorations = /*#__PURE__*/function () {
         top: y,
         left: x
       });
-      return startPos ? startPos.pos : 1;
+      if (expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+        return startPos ? startPos.pos : 0;
+      } else {
+        return startPos ? startPos.pos : 1;
+      }
     }
   }, {
     key: "getEndPos",