@atlaskit/editor-plugin-find-replace 2.3.1 → 2.4.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 2.4.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.4.0
+
+### Minor Changes
+
+- [#167734](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/167734)
+  [`74e7440fe9307`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/74e7440fe9307) -
+  [ux] [ED-27959] this change is disabling the Replace/ Replace All functionality for non-text
+  matches with the platform_editor_find_and_replace_1 flag enabled
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.3.1
 
 ### Patch 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 _actions = require("./actions");
 var _pluginFactory = require("./plugin-factory");
 var _utils = require("./utils");
@@ -153,6 +154,9 @@ var replace = exports.replace = function replace(replaceText) {
       index = _getPluginState6.index,
       findText = _getPluginState6.findText;
     if (matches[index]) {
+      if (!matches[index].canReplace && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1')) {
+        return tr;
+      }
       var _matches$index = matches[index],
         start = _matches$index.start,
         end = _matches$index.end;
@@ -172,6 +176,9 @@ var replaceAll = exports.replaceAll = function replaceAll(replaceText) {
   }, function (tr, state) {
     var pluginState = (0, _pluginFactory.getPluginState)(state);
     pluginState.matches.forEach(function (match) {
+      if (!match.canReplace && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1')) {
+        return tr;
+      }
       tr.insertText(replaceText, tr.mapping.map(match.start), tr.mapping.map(match.end));
     });
     tr.setMeta('scrollIntoView', false);

package/dist/cjs/ui/FindReplace.js

@@ -107,6 +107,7 @@ var FindReplace = /*#__PURE__*/function (_React$PureComponent) {
       var _this$props = this.props,
         findText = _this$props.findText,
         count = _this$props.count,
+        isReplaceable = _this$props.isReplaceable,
         shouldFocus = _this$props.shouldFocus,
         onFind = _this$props.onFind,
         onFindBlur = _this$props.onFindBlur,
@@ -147,7 +148,7 @@ var FindReplace = /*#__PURE__*/function (_React$PureComponent) {
           css: _uiStyles.ruleStyles,
           id: "replace-hr-element"
         }), (0, _platformFeatureFlags.fg)('editor_a11y_refactor_find_replace_style') ? (0, _react2.jsx)(_ReplaceNext.default, {
-          canReplace: count.total > 0,
+          canReplace: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
           replaceText: replaceText,
           onReplace: onReplace,
           onReplaceAll: onReplaceAll,
@@ -162,7 +163,7 @@ var FindReplace = /*#__PURE__*/function (_React$PureComponent) {
           setFindTyped: this.setFindTyped,
           focusToolbarButton: focusToolbarButton
         }) : (0, _react2.jsx)(_Replace.default, {
-          canReplace: count.total > 0,
+          canReplace: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
           replaceText: replaceText,
           onReplace: onReplace,
           onReplaceAll: onReplaceAll,

package/dist/cjs/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../pm-plugins/commands");
 var _commandsWithAnalytics = require("../pm-plugins/commands-with-analytics");
 var _FindReplaceDropdown = _interopRequireDefault(require("./FindReplaceDropdown"));
@@ -72,7 +73,7 @@ var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (
   };
 });
 var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(_ref2) {
-  var _api$analytics;
+  var _api$analytics, _matches$index;
   var popupsBoundariesElement = _ref2.popupsBoundariesElement,
     popupsMountPoint = _ref2.popupsMountPoint,
     popupsScrollableElement = _ref2.popupsScrollableElement,
@@ -185,6 +186,10 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     findText: findText,
     index: index,
     numMatches: matches.length,
+    isReplaceable: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? (_matches$index = matches[index]) === null || _matches$index === void 0 ? void 0 : _matches$index.canReplace : undefined,
+    numReplaceable: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? matches.filter(function (match) {
+      return match.canReplace === true;
+    }).length : undefined,
     replaceText: replaceText,
     shouldFocus: shouldFocus,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/cjs/ui/FindReplaceDropdown.js

@@ -27,6 +27,7 @@ var FindReplaceDropdown = function FindReplaceDropdown(props) {
     index = props.index,
     numMatches = props.numMatches,
     popupsMountPoint = props.popupsMountPoint,
+    numReplaceable = props.numReplaceable,
     onCancel = props.onCancel;
   if (!popupsMountPoint) {
     return null;
@@ -59,7 +60,8 @@ var FindReplaceDropdown = function FindReplaceDropdown(props) {
     replaceText: replaceText,
     count: {
       index: index,
-      total: numMatches
+      total: numMatches,
+      totalReplaceable: numReplaceable
     }
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading

package/dist/cjs/ui/FindReplaceToolbarButton.js

@@ -106,6 +106,7 @@ var FindReplaceToolbarButton = /*#__PURE__*/function (_React$PureComponent) {
         isActive = _this$props.isActive,
         index = _this$props.index,
         numMatches = _this$props.numMatches,
+        numReplaceable = _this$props.numReplaceable,
         formatMessage = _this$props.intl.formatMessage,
         takeFullWidth = _this$props.takeFullWidth,
         _this$props$isButtonH = _this$props.isButtonHidden,
@@ -187,7 +188,8 @@ var FindReplaceToolbarButton = /*#__PURE__*/function (_React$PureComponent) {
         replaceText: replaceText,
         count: {
           index: index,
-          total: numMatches
+          total: numMatches,
+          totalReplaceable: numReplaceable
         },
         focusToolbarButton: this.focusToolbarButton
         // Ignored via go/ees005

package/dist/cjs/ui/Replace.js

@@ -19,8 +19,9 @@ var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _form = require("@atlaskit/form");
-var _chevronDownHipchatChevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down--hipchat-chevron-down"));
-var _chevronUpHipchatChevronUp = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-up--hipchat-chevron-up"));
+var _chevronDownHipchatChevronDown = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-down--hipchat-chevron-down"));
+var _chevronUpHipchatChevronUp = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-up--hipchat-chevron-up"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
 var _FindReplaceTooltipButton = require("./FindReplaceTooltipButton");
@@ -101,10 +102,17 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         _this.setState({
           isHelperMessageVisible: true
         });
-        _this.triggerSuccessReplacementMessageUpdate(_this.props.count.total);
-        _this.setState({
-          replaceCount: _this.props.count.total
-        });
+        if (_this.props.count.totalReplaceable && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1')) {
+          _this.triggerSuccessReplacementMessageUpdate(_this.props.count.totalReplaceable);
+          _this.setState({
+            replaceCount: _this.props.count.totalReplaceable
+          });
+        } else {
+          _this.triggerSuccessReplacementMessageUpdate(_this.props.count.total);
+          _this.setState({
+            replaceCount: _this.props.count.total
+          });
+        }
         _this.props.setFindTyped(false);
       });
     });
@@ -250,7 +258,12 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         css: _uiStyles.nextPreviousItemStyles
       }, (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
         title: this.findNext,
-        icon: _chevronDownHipchatChevronDown.default,
+        icon: function icon(iconProps) {
+          return (0, _react2.jsx)(_chevronDownHipchatChevronDown.default, {
+            label: iconProps.label,
+            size: "small"
+          });
+        },
         iconLabel: this.findNext,
         keymapDescription: 'Enter',
         onClick: this.handleFindNextClick,
@@ -259,7 +272,12 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         css: _uiStyles.nextPreviousItemStyles
       }, (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
         title: this.findPrevious,
-        icon: _chevronUpHipchatChevronUp.default,
+        icon: function icon(iconProps) {
+          return (0, _react2.jsx)(_chevronUpHipchatChevronUp.default, {
+            label: iconProps.label,
+            size: "small"
+          });
+        },
         iconLabel: this.findPrevious,
         keymapDescription: 'Shift Enter',
         onClick: this.handleFindPrevClick,
@@ -284,7 +302,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         testId: this.replaceAll,
         id: "replaceAll-button",
         onClick: this.handleReplaceAllClick,
-        isDisabled: !canReplace
+        isDisabled: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
       }, this.replaceAll))), (0, _react2.jsx)("div", {
         css: _uiStyles.orderZeroStyles
       }, (0, _react2.jsx)(_new.default, {

package/dist/cjs/ui/ReplaceNext.js

@@ -13,8 +13,9 @@ var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _form = require("@atlaskit/form");
-var _chevronDownHipchatChevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down--hipchat-chevron-down"));
-var _chevronUpHipchatChevronUp = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-up--hipchat-chevron-up"));
+var _chevronDownHipchatChevronDown = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-down--hipchat-chevron-down"));
+var _chevronUpHipchatChevronUp = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-up--hipchat-chevron-up"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
 var _FindReplaceTooltipButton = require("./FindReplaceTooltipButton");
@@ -143,8 +144,13 @@ var Replace = function Replace(_ref) {
         replaceText: replaceText
       });
       setIsHelperMessageVisible(true);
-      triggerSuccessReplacementMessageUpdate(count.total);
-      setReplaceCount(count.total);
+      if (count.totalReplaceable && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1')) {
+        triggerSuccessReplacementMessageUpdate(count.totalReplaceable);
+        setReplaceCount(count.totalReplaceable);
+      } else {
+        triggerSuccessReplacementMessageUpdate(count.total);
+        setReplaceCount(count.total);
+      }
       setFindTyped(false);
     });
   };
@@ -211,14 +217,24 @@ var Replace = function Replace(_ref) {
     xcss: actionButtonInlineStyles
   }, /*#__PURE__*/_react.default.createElement(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
     title: formatMessage(_messages.findReplaceMessages.findNext),
-    icon: _chevronDownHipchatChevronDown.default,
+    icon: function icon(iconProps) {
+      return /*#__PURE__*/_react.default.createElement(_chevronDownHipchatChevronDown.default, {
+        label: iconProps.label,
+        size: "small"
+      });
+    },
     iconLabel: formatMessage(_messages.findReplaceMessages.findNext),
     keymapDescription: 'Enter',
     onClick: handleFindNextClick,
     disabled: count.total <= 1
   }), /*#__PURE__*/_react.default.createElement(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
     title: findPrevious,
-    icon: _chevronUpHipchatChevronUp.default,
+    icon: function icon(iconProps) {
+      return /*#__PURE__*/_react.default.createElement(_chevronUpHipchatChevronUp.default, {
+        label: iconProps.label,
+        size: "small"
+      });
+    },
     iconLabel: findPrevious,
     keymapDescription: 'Shift Enter',
     onClick: handleFindPrevClick,
@@ -233,7 +249,7 @@ var Replace = function Replace(_ref) {
     testId: replaceAll,
     id: "replaceAll-button",
     onClick: handleReplaceAllClick,
-    isDisabled: !canReplace
+    isDisabled: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
   }, replaceAll)), /*#__PURE__*/_react.default.createElement(_new.default, {
     appearance: "subtle",
     testId: closeFindReplaceDialog,

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

@@ -1,5 +1,6 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FindReplaceActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
 import { createDecoration, findDecorationFromMatch, findMatches, findSearchIndex, getSelectedText, getSelectionForMatch, nextIndex, prevIndex, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
@@ -149,6 +150,9 @@ export const replace = replaceText => withScrollIntoView(createCommand(state =>
     findText
   } = getPluginState(state);
   if (matches[index]) {
+    if (!matches[index].canReplace && fg('platform_editor_find_and_replace_1')) {
+      return tr;
+    }
     const {
       start,
       end
@@ -167,6 +171,9 @@ export const replaceAll = replaceText => createCommand({
 }, (tr, state) => {
   const pluginState = getPluginState(state);
   pluginState.matches.forEach(match => {
+    if (!match.canReplace && fg('platform_editor_find_and_replace_1')) {
+      return tr;
+    }
     tr.insertText(replaceText, tr.mapping.map(match.start), tr.mapping.map(match.end));
   });
   tr.setMeta('scrollIntoView', false);

package/dist/es2019/ui/FindReplace.js

@@ -84,6 +84,7 @@ class FindReplace extends React.PureComponent {
     const {
       findText,
       count,
+      isReplaceable,
       shouldFocus,
       onFind,
       onFindBlur,
@@ -125,7 +126,7 @@ class FindReplace extends React.PureComponent {
         css: ruleStyles,
         id: "replace-hr-element"
       }), fg('editor_a11y_refactor_find_replace_style') ? jsx(ReplaceNext, {
-        canReplace: count.total > 0,
+        canReplace: fg('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
         replaceText: replaceText,
         onReplace: onReplace,
         onReplaceAll: onReplaceAll,
@@ -140,7 +141,7 @@ class FindReplace extends React.PureComponent {
         setFindTyped: this.setFindTyped,
         focusToolbarButton: focusToolbarButton
       }) : jsx(Replace, {
-        canReplace: count.total > 0,
+        canReplace: fg('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
         replaceText: replaceText,
         onReplace: onReplace,
         onReplaceAll: onReplaceAll,

package/dist/es2019/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -1,6 +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 { blur, toggleMatchCase } from '../pm-plugins/commands';
 import { activateWithAnalytics, cancelSearchWithAnalytics, findNextWithAnalytics, findPrevWithAnalytics, findWithAnalytics, replaceAllWithAnalytics, replaceWithAnalytics } from '../pm-plugins/commands-with-analytics';
 import FindReplaceDropdown from './FindReplaceDropdown';
@@ -74,7 +75,7 @@ const FindReplaceToolbarButtonWithState = ({
   isButtonHidden,
   doesNotHaveButton
 }) => {
-  var _api$analytics;
+  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,
@@ -172,6 +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,
     replaceText: replaceText,
     shouldFocus: shouldFocus,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/es2019/ui/FindReplaceDropdown.js

@@ -21,6 +21,7 @@ const FindReplaceDropdown = props => {
     index,
     numMatches,
     popupsMountPoint,
+    numReplaceable,
     onCancel
   } = props;
   if (!popupsMountPoint) {
@@ -54,7 +55,8 @@ const FindReplaceDropdown = props => {
     replaceText: replaceText,
     count: {
       index,
-      total: numMatches
+      total: numMatches,
+      totalReplaceable: numReplaceable
     }
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading

package/dist/es2019/ui/FindReplaceToolbarButton.js

@@ -94,6 +94,7 @@ class FindReplaceToolbarButton extends React.PureComponent {
       isActive,
       index,
       numMatches,
+      numReplaceable,
       intl: {
         formatMessage
       },
@@ -177,7 +178,8 @@ class FindReplaceToolbarButton extends React.PureComponent {
       replaceText: replaceText,
       count: {
         index,
-        total: numMatches
+        total: numMatches,
+        totalReplaceable: numReplaceable
       },
       focusToolbarButton: this.focusToolbarButton
       // Ignored via go/ees005

package/dist/es2019/ui/Replace.js

@@ -13,8 +13,9 @@ import Button from '@atlaskit/button/new';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { findReplaceMessages as messages } from '@atlaskit/editor-common/messages';
 import { Label, ValidMessage } from '@atlaskit/form';
-import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down--hipchat-chevron-down';
-import ChevronUpIcon from '@atlaskit/icon/utility/migration/chevron-up--hipchat-chevron-up';
+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 { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
@@ -82,10 +83,17 @@ class Replace extends React.PureComponent {
       this.setState({
         isHelperMessageVisible: true
       });
-      this.triggerSuccessReplacementMessageUpdate(this.props.count.total);
-      this.setState({
-        replaceCount: this.props.count.total
-      });
+      if (this.props.count.totalReplaceable && fg('platform_editor_find_and_replace_1')) {
+        this.triggerSuccessReplacementMessageUpdate(this.props.count.totalReplaceable);
+        this.setState({
+          replaceCount: this.props.count.totalReplaceable
+        });
+      } else {
+        this.triggerSuccessReplacementMessageUpdate(this.props.count.total);
+        this.setState({
+          replaceCount: this.props.count.total
+        });
+      }
       this.props.setFindTyped(false);
     }));
     _defineProperty(this, "handleCompositionStart", () => {
@@ -231,7 +239,10 @@ class Replace extends React.PureComponent {
       css: nextPreviousItemStyles
     }, jsx(FindReplaceTooltipButton, {
       title: this.findNext,
-      icon: ChevronDownIcon,
+      icon: iconProps => jsx(ChevronDownIcon, {
+        label: iconProps.label,
+        size: "small"
+      }),
       iconLabel: this.findNext,
       keymapDescription: 'Enter',
       onClick: this.handleFindNextClick,
@@ -240,7 +251,10 @@ class Replace extends React.PureComponent {
       css: nextPreviousItemStyles
     }, jsx(FindReplaceTooltipButton, {
       title: this.findPrevious,
-      icon: ChevronUpIcon,
+      icon: iconProps => jsx(ChevronUpIcon, {
+        label: iconProps.label,
+        size: "small"
+      }),
       iconLabel: this.findPrevious,
       keymapDescription: 'Shift Enter',
       onClick: this.handleFindPrevClick,
@@ -265,7 +279,7 @@ class Replace extends React.PureComponent {
       testId: this.replaceAll,
       id: "replaceAll-button",
       onClick: this.handleReplaceAllClick,
-      isDisabled: !canReplace
+      isDisabled: fg('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
     }, this.replaceAll))), jsx("div", {
       css: orderZeroStyles
     }, jsx(Button, {

package/dist/es2019/ui/ReplaceNext.js

@@ -4,8 +4,9 @@ import Button from '@atlaskit/button/new';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { findReplaceMessages as messages } from '@atlaskit/editor-common/messages';
 import { ValidMessage } from '@atlaskit/form';
-import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down--hipchat-chevron-down';
-import ChevronUpIcon from '@atlaskit/icon/utility/migration/chevron-up--hipchat-chevron-up';
+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 { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
@@ -114,8 +115,13 @@ const Replace = ({
       replaceText
     });
     setIsHelperMessageVisible(true);
-    triggerSuccessReplacementMessageUpdate(count.total);
-    setReplaceCount(count.total);
+    if (count.totalReplaceable && fg('platform_editor_find_and_replace_1')) {
+      triggerSuccessReplacementMessageUpdate(count.totalReplaceable);
+      setReplaceCount(count.totalReplaceable);
+    } else {
+      triggerSuccessReplacementMessageUpdate(count.total);
+      setReplaceCount(count.total);
+    }
     setFindTyped(false);
   });
   const handleCompositionStart = () => {
@@ -181,14 +187,20 @@ const Replace = ({
     xcss: actionButtonInlineStyles
   }, /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
     title: formatMessage(messages.findNext),
-    icon: ChevronDownIcon,
+    icon: iconProps => /*#__PURE__*/React.createElement(ChevronDownIcon, {
+      label: iconProps.label,
+      size: "small"
+    }),
     iconLabel: formatMessage(messages.findNext),
     keymapDescription: 'Enter',
     onClick: handleFindNextClick,
     disabled: count.total <= 1
   }), /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
     title: findPrevious,
-    icon: ChevronUpIcon,
+    icon: iconProps => /*#__PURE__*/React.createElement(ChevronUpIcon, {
+      label: iconProps.label,
+      size: "small"
+    }),
     iconLabel: findPrevious,
     keymapDescription: 'Shift Enter',
     onClick: handleFindPrevClick,
@@ -203,7 +215,7 @@ const Replace = ({
     testId: replaceAll,
     id: "replaceAll-button",
     onClick: handleReplaceAllClick,
-    isDisabled: !canReplace
+    isDisabled: fg('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
   }, replaceAll)), /*#__PURE__*/React.createElement(Button, {
     appearance: "subtle",
     testId: closeFindReplaceDialog,

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

@@ -1,5 +1,6 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FindReplaceActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
 import { createDecoration, findDecorationFromMatch, findMatches, findSearchIndex, getSelectedText, getSelectionForMatch, nextIndex, prevIndex, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
@@ -146,6 +147,9 @@ 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')) {
+        return tr;
+      }
       var _matches$index = matches[index],
         start = _matches$index.start,
         end = _matches$index.end;
@@ -165,6 +169,9 @@ 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')) {
+        return tr;
+      }
       tr.insertText(replaceText, tr.mapping.map(match.start), tr.mapping.map(match.end));
     });
     tr.setMeta('scrollIntoView', false);

package/dist/esm/ui/FindReplace.js

@@ -105,6 +105,7 @@ var FindReplace = /*#__PURE__*/function (_React$PureComponent) {
       var _this$props = this.props,
         findText = _this$props.findText,
         count = _this$props.count,
+        isReplaceable = _this$props.isReplaceable,
         shouldFocus = _this$props.shouldFocus,
         onFind = _this$props.onFind,
         onFindBlur = _this$props.onFindBlur,
@@ -145,7 +146,7 @@ var FindReplace = /*#__PURE__*/function (_React$PureComponent) {
           css: ruleStyles,
           id: "replace-hr-element"
         }), fg('editor_a11y_refactor_find_replace_style') ? jsx(ReplaceNext, {
-          canReplace: count.total > 0,
+          canReplace: fg('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
           replaceText: replaceText,
           onReplace: onReplace,
           onReplaceAll: onReplaceAll,
@@ -160,7 +161,7 @@ var FindReplace = /*#__PURE__*/function (_React$PureComponent) {
           setFindTyped: this.setFindTyped,
           focusToolbarButton: focusToolbarButton
         }) : jsx(Replace, {
-          canReplace: count.total > 0,
+          canReplace: fg('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
           replaceText: replaceText,
           onReplace: onReplace,
           onReplaceAll: onReplaceAll,

package/dist/esm/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -2,6 +2,7 @@ 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 { fg } from '@atlaskit/platform-feature-flags';
 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';
@@ -64,7 +65,7 @@ var useSharedState = sharedPluginStateHookMigratorFactory(function (api) {
   };
 });
 var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(_ref2) {
-  var _api$analytics;
+  var _api$analytics, _matches$index;
   var popupsBoundariesElement = _ref2.popupsBoundariesElement,
     popupsMountPoint = _ref2.popupsMountPoint,
     popupsScrollableElement = _ref2.popupsScrollableElement,
@@ -177,6 +178,10 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     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(function (match) {
+      return match.canReplace === true;
+    }).length : undefined,
     replaceText: replaceText,
     shouldFocus: shouldFocus,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/esm/ui/FindReplaceDropdown.js

@@ -20,6 +20,7 @@ var FindReplaceDropdown = function FindReplaceDropdown(props) {
     index = props.index,
     numMatches = props.numMatches,
     popupsMountPoint = props.popupsMountPoint,
+    numReplaceable = props.numReplaceable,
     onCancel = props.onCancel;
   if (!popupsMountPoint) {
     return null;
@@ -52,7 +53,8 @@ var FindReplaceDropdown = function FindReplaceDropdown(props) {
     replaceText: replaceText,
     count: {
       index: index,
-      total: numMatches
+      total: numMatches,
+      totalReplaceable: numReplaceable
     }
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading

package/dist/esm/ui/FindReplaceToolbarButton.js

@@ -101,6 +101,7 @@ var FindReplaceToolbarButton = /*#__PURE__*/function (_React$PureComponent) {
         isActive = _this$props.isActive,
         index = _this$props.index,
         numMatches = _this$props.numMatches,
+        numReplaceable = _this$props.numReplaceable,
         formatMessage = _this$props.intl.formatMessage,
         takeFullWidth = _this$props.takeFullWidth,
         _this$props$isButtonH = _this$props.isButtonHidden,
@@ -182,7 +183,8 @@ var FindReplaceToolbarButton = /*#__PURE__*/function (_React$PureComponent) {
         replaceText: replaceText,
         count: {
           index: index,
-          total: numMatches
+          total: numMatches,
+          totalReplaceable: numReplaceable
         },
         focusToolbarButton: this.focusToolbarButton
         // Ignored via go/ees005

package/dist/esm/ui/Replace.js

@@ -20,8 +20,9 @@ import Button from '@atlaskit/button/new';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { findReplaceMessages as messages } from '@atlaskit/editor-common/messages';
 import { Label, ValidMessage } from '@atlaskit/form';
-import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down--hipchat-chevron-down';
-import ChevronUpIcon from '@atlaskit/icon/utility/migration/chevron-up--hipchat-chevron-up';
+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 { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
@@ -96,10 +97,17 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         _this.setState({
           isHelperMessageVisible: true
         });
-        _this.triggerSuccessReplacementMessageUpdate(_this.props.count.total);
-        _this.setState({
-          replaceCount: _this.props.count.total
-        });
+        if (_this.props.count.totalReplaceable && fg('platform_editor_find_and_replace_1')) {
+          _this.triggerSuccessReplacementMessageUpdate(_this.props.count.totalReplaceable);
+          _this.setState({
+            replaceCount: _this.props.count.totalReplaceable
+          });
+        } else {
+          _this.triggerSuccessReplacementMessageUpdate(_this.props.count.total);
+          _this.setState({
+            replaceCount: _this.props.count.total
+          });
+        }
         _this.props.setFindTyped(false);
       });
     });
@@ -245,7 +253,12 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         css: nextPreviousItemStyles
       }, jsx(FindReplaceTooltipButton, {
         title: this.findNext,
-        icon: ChevronDownIcon,
+        icon: function icon(iconProps) {
+          return jsx(ChevronDownIcon, {
+            label: iconProps.label,
+            size: "small"
+          });
+        },
         iconLabel: this.findNext,
         keymapDescription: 'Enter',
         onClick: this.handleFindNextClick,
@@ -254,7 +267,12 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         css: nextPreviousItemStyles
       }, jsx(FindReplaceTooltipButton, {
         title: this.findPrevious,
-        icon: ChevronUpIcon,
+        icon: function icon(iconProps) {
+          return jsx(ChevronUpIcon, {
+            label: iconProps.label,
+            size: "small"
+          });
+        },
         iconLabel: this.findPrevious,
         keymapDescription: 'Shift Enter',
         onClick: this.handleFindPrevClick,
@@ -279,7 +297,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         testId: this.replaceAll,
         id: "replaceAll-button",
         onClick: this.handleReplaceAllClick,
-        isDisabled: !canReplace
+        isDisabled: fg('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
       }, this.replaceAll))), jsx("div", {
         css: orderZeroStyles
       }, jsx(Button, {

package/dist/esm/ui/ReplaceNext.js

@@ -5,8 +5,9 @@ import Button from '@atlaskit/button/new';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { findReplaceMessages as messages } from '@atlaskit/editor-common/messages';
 import { ValidMessage } from '@atlaskit/form';
-import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down--hipchat-chevron-down';
-import ChevronUpIcon from '@atlaskit/icon/utility/migration/chevron-up--hipchat-chevron-up';
+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 { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
@@ -134,8 +135,13 @@ var Replace = function Replace(_ref) {
         replaceText: replaceText
       });
       setIsHelperMessageVisible(true);
-      triggerSuccessReplacementMessageUpdate(count.total);
-      setReplaceCount(count.total);
+      if (count.totalReplaceable && fg('platform_editor_find_and_replace_1')) {
+        triggerSuccessReplacementMessageUpdate(count.totalReplaceable);
+        setReplaceCount(count.totalReplaceable);
+      } else {
+        triggerSuccessReplacementMessageUpdate(count.total);
+        setReplaceCount(count.total);
+      }
       setFindTyped(false);
     });
   };
@@ -202,14 +208,24 @@ var Replace = function Replace(_ref) {
     xcss: actionButtonInlineStyles
   }, /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
     title: formatMessage(messages.findNext),
-    icon: ChevronDownIcon,
+    icon: function icon(iconProps) {
+      return /*#__PURE__*/React.createElement(ChevronDownIcon, {
+        label: iconProps.label,
+        size: "small"
+      });
+    },
     iconLabel: formatMessage(messages.findNext),
     keymapDescription: 'Enter',
     onClick: handleFindNextClick,
     disabled: count.total <= 1
   }), /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
     title: findPrevious,
-    icon: ChevronUpIcon,
+    icon: function icon(iconProps) {
+      return /*#__PURE__*/React.createElement(ChevronUpIcon, {
+        label: iconProps.label,
+        size: "small"
+      });
+    },
     iconLabel: findPrevious,
     keymapDescription: 'Shift Enter',
     onClick: handleFindPrevClick,
@@ -224,7 +240,7 @@ var Replace = function Replace(_ref) {
     testId: replaceAll,
     id: "replaceAll-button",
     onClick: handleReplaceAllClick,
-    isDisabled: !canReplace
+    isDisabled: fg('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
   }, replaceAll)), /*#__PURE__*/React.createElement(Button, {
     appearance: "subtle",
     testId: closeFindReplaceDialog,

package/dist/types/ui/FindReplace.d.ts

@@ -12,7 +12,9 @@ export type FindReplaceProps = {
     count: {
         index: number;
         total: number;
+        totalReplaceable?: number;
     };
+    isReplaceable?: boolean;
     shouldFocus: boolean;
     onFindBlur: () => void;
     onFind: (findText?: string) => void;

package/dist/types/ui/FindReplaceDropdown.d.ts

@@ -6,6 +6,8 @@ export interface FindReplaceDropdownProps extends Omit<FindReplaceProps, 'count'
     index: number;
     numMatches: number;
     isActive: boolean;
+    isReplaceable?: boolean;
+    numReplaceable?: number;
     popupsMountPoint?: HTMLElement;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
 }

package/dist/types/ui/FindReplaceToolbarButton.d.ts

@@ -10,6 +10,7 @@ export interface FindReplaceToolbarButtonProps extends Omit<FindReplaceProps, 'c
     index: number;
     numMatches: number;
     isActive: boolean;
+    numReplaceable?: number;
     onActivate: () => void;
     isReducedSpacing?: boolean;
     popupsMountPoint?: HTMLElement;

package/dist/types/ui/Replace.d.ts

@@ -24,6 +24,7 @@ export type ReplaceProps = {
     count: {
         index: number;
         total: number;
+        totalReplaceable?: number;
     };
     onFindNext: ({ triggerMethod, }: {
         triggerMethod: TRIGGER_METHOD.KEYBOARD | TRIGGER_METHOD.BUTTON;

package/dist/types/ui/ReplaceNext.d.ts

@@ -20,6 +20,7 @@ export type ReplaceProps = {
     count: {
         index: number;
         total: number;
+        totalReplaceable?: number;
     };
     onFindNext: ({ triggerMethod, }: {
         triggerMethod: TRIGGER_METHOD.KEYBOARD | TRIGGER_METHOD.BUTTON;

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

@@ -12,7 +12,9 @@ export type FindReplaceProps = {
     count: {
         index: number;
         total: number;
+        totalReplaceable?: number;
     };
+    isReplaceable?: boolean;
     shouldFocus: boolean;
     onFindBlur: () => void;
     onFind: (findText?: string) => void;

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

@@ -6,6 +6,8 @@ export interface FindReplaceDropdownProps extends Omit<FindReplaceProps, 'count'
     index: number;
     numMatches: number;
     isActive: boolean;
+    isReplaceable?: boolean;
+    numReplaceable?: number;
     popupsMountPoint?: HTMLElement;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
 }

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

@@ -10,6 +10,7 @@ export interface FindReplaceToolbarButtonProps extends Omit<FindReplaceProps, 'c
     index: number;
     numMatches: number;
     isActive: boolean;
+    numReplaceable?: number;
     onActivate: () => void;
     isReducedSpacing?: boolean;
     popupsMountPoint?: HTMLElement;

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

@@ -24,6 +24,7 @@ export type ReplaceProps = {
     count: {
         index: number;
         total: number;
+        totalReplaceable?: number;
     };
     onFindNext: ({ triggerMethod, }: {
         triggerMethod: TRIGGER_METHOD.KEYBOARD | TRIGGER_METHOD.BUTTON;

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

@@ -20,6 +20,7 @@ export type ReplaceProps = {
     count: {
         index: number;
         total: number;
+        totalReplaceable?: number;
     };
     onFindNext: ({ triggerMethod, }: {
         triggerMethod: TRIGGER_METHOD.KEYBOARD | TRIGGER_METHOD.BUTTON;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-find-replace",
-	"version": "2.3.1",
+	"version": "2.4.1",
 	"description": "find replace plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/button": "^23.2.0",
-		"@atlaskit/editor-common": "^106.5.0",
+		"@atlaskit/editor-common": "^106.6.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^3.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/primitives": "^14.8.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^6.0.0",
+		"@atlaskit/tmp-editor-statsig": "^7.0.0",
 		"@atlaskit/tokens": "^5.1.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",