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

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 2.8.0
+
+### Minor Changes
+
+- [#175569](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/175569)
+  [`3bcbd0cff0437`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3bcbd0cff0437) -
+  [ux] ED-27958 extend the find algorithm to search smart cards behind
+  platform_editor_find_and_replace_improvements
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.7.2
+
+### Patch Changes
+
+- [#176094](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/176094)
+  [`09e338a3d7dab`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/09e338a3d7dab) -
+  [ED-28357] move find&replace work from behind feature gates to the new experiment
+  platform_editor_find_and_replace_improvements
+- Updated dependencies
+
 ## 2.7.1
 
 ### Patch Changes

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

@@ -7,7 +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");
 var _utils = require("./utils");
@@ -178,7 +178,7 @@ 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')) {
+      if (!matches[index].canReplace && (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
         return tr;
       }
       var _matches$index = matches[index],
@@ -200,7 +200,7 @@ 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')) {
+      if (!match.canReplace && (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
         return tr;
       }
       tr.insertText(replaceText, tr.mapping.map(match.start), tr.mapping.map(match.end));
@@ -278,10 +278,10 @@ var updateSelectedHighlight = function updateSelectedHighlight(state, nextSelect
     decorationSet = (0, _utils.removeDecorationsFromSet)(decorationSet, decorationsToRemove, state.doc);
   }
   if (currentSelectedMatch) {
-    decorationSet = decorationSet.add(state.doc, [(0, _utils.createDecoration)(currentSelectedMatch.start, currentSelectedMatch.end)]);
+    decorationSet = decorationSet.add(state.doc, [(0, _utils.createDecoration)(currentSelectedMatch.start, currentSelectedMatch.end, false, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? currentSelectedMatch.nodeType : undefined)]);
   }
   if (nextSelectedMatch) {
-    decorationSet = decorationSet.add(state.doc, [(0, _utils.createDecoration)(nextSelectedMatch.start, nextSelectedMatch.end, true)]);
+    decorationSet = decorationSet.add(state.doc, [(0, _utils.createDecoration)(nextSelectedMatch.start, nextSelectedMatch.end, true, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? nextSelectedMatch.nodeType : undefined)]);
   }
   return decorationSet;
 };

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

@@ -8,7 +8,7 @@ exports.initialState = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 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 _pluginFactory = require("./plugin-factory");
 var _pluginKey = require("./plugin-key");
 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; }
@@ -27,7 +27,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, getInt
   return new _safePlugin.SafePlugin({
     key: _pluginKey.findReplacePluginKey,
     state: (0, _pluginFactory.createPluginState)(dispatch, function () {
-      return (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_part_2') ? _objectSpread(_objectSpread({}, initialState), {}, {
+      return (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? _objectSpread(_objectSpread({}, initialState), {}, {
         getIntl: getIntl,
         api: api
       }) : _objectSpread({}, initialState);

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _actions = require("./actions");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -47,7 +47,7 @@ var reducer = function reducer(getInitialState) {
       case _actions.FindReplaceActionTypes.CANCEL:
         var getIntl = state.getIntl,
           api = state.api;
-        return (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_part_2') ? _objectSpread(_objectSpread({}, getInitialState()), {}, {
+        return (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? _objectSpread(_objectSpread({}, getInitialState()), {}, {
           getIntl: getIntl,
           api: api
         }) : getInitialState();

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

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _pluginFactory = require("../plugin-factory");
 var _index = require("./index");
 // max number of decorations to apply at once
@@ -248,7 +249,7 @@ var BatchDecorations = /*#__PURE__*/function () {
       return {
         viewportStartPos: viewportStartPos,
         viewportEndPos: viewportEndPos,
-        startPos: 1,
+        startPos: (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? 0 : 1,
         endPos: editorView.state.doc.nodeSize
       };
     }
@@ -259,7 +260,11 @@ var BatchDecorations = /*#__PURE__*/function () {
         top: y,
         left: x
       });
-      return startPos ? startPos.pos : 1;
+      if ((0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+        return startPos ? startPos.pos : 0;
+      } else {
+        return startPos ? startPos.pos : 1;
+      }
     }
   }, {
     key: "getEndPos",

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,12 +9,15 @@ exports.findMatches = findMatches;
 exports.findSearchIndex = findSearchIndex;
 exports.getSelectedText = getSelectedText;
 exports.removeMatchesFromSet = exports.removeDecorationsFromSet = exports.prevIndex = exports.nextIndex = exports.isMatchAffectedByStep = exports.getSelectionForMatch = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _classnames2 = _interopRequireDefault(require("classnames"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _resource = require("@atlaskit/mention/resource");
 var _types = require("@atlaskit/mention/types");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _tokens = require("@atlaskit/tokens");
 var _styles = require("../../ui/styles");
 function getSelectedText(selection) {
   var text = '';
@@ -26,18 +30,37 @@ function getSelectedText(selection) {
 var createDecorations = exports.createDecorations = function createDecorations(selectedIndex, matches) {
   return matches.map(function (_ref, i) {
     var start = _ref.start,
-      end = _ref.end;
-    return createDecoration(start, end, i === selectedIndex);
+      end = _ref.end,
+      nodeType = _ref.nodeType;
+    return createDecoration(start, end, i === selectedIndex, nodeType);
   });
 };
-var createDecoration = exports.createDecoration = function createDecoration(start, end, isSelected) {
-  var className = _styles.searchMatchClass;
-  if (isSelected) {
-    className += " ".concat(_styles.selectedSearchMatchClass);
+var isBlock = function isBlock(nodeType) {
+  return nodeType === 'blockCard' || nodeType === 'embedCard';
+};
+var createDecoration = exports.createDecoration = function createDecoration(start, end, isSelected, nodeType) {
+  if ((0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+    var _getGlobalTheme = (0, _tokens.getGlobalTheme)(),
+      colorMode = _getGlobalTheme.colorMode;
+    var className = (0, _classnames2.default)(_styles.searchMatchClass, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _styles.selectedSearchMatchClass, isSelected), _styles.blockSearchMatchClass, isBlock(nodeType)), _styles.darkModeSearchMatchClass, colorMode === 'dark'));
+    if (isBlock(nodeType)) {
+      return _view.Decoration.node(start, end, {
+        class: className
+      });
+    } else {
+      return _view.Decoration.inline(start, end, {
+        class: className
+      });
+    }
+  } else {
+    var _className = _styles.searchMatchClass;
+    if (isSelected) {
+      _className += " ".concat(_styles.selectedSearchMatchClass);
+    }
+    return _view.Decoration.inline(start, end, {
+      class: _className
+    });
   }
-  return _view.Decoration.inline(start, end, {
-    class: className
-  });
 };
 function findMatches(_ref2) {
   var content = _ref2.content,
@@ -69,7 +92,8 @@ function findMatches(_ref2) {
       matches.push({
         start: pos + index,
         end: pos + end,
-        canReplace: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? true : undefined
+        canReplace: (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? true : undefined,
+        nodeType: (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? 'text' : undefined
       });
       index = text.indexOf(searchText, end);
     }
@@ -80,14 +104,8 @@ function findMatches(_ref2) {
     }
     var pos = textGrouping.pos;
     var text = textGrouping.text;
-    // status text is rendered in all caps regardless so case matching should work if the search text is all caps
-    if ((0, _platformFeatureFlags.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();
@@ -98,11 +116,12 @@ function findMatches(_ref2) {
       matches.push({
         start: start,
         end: start + nodeSize,
-        canReplace: false
+        canReplace: false,
+        nodeType: 'status'
       });
     }
   };
-  var collectDateOrMentionMatch = function collectDateOrMentionMatch(textGrouping, nodeSize) {
+  var collectNodeMatch = function collectNodeMatch(textGrouping, node) {
     if (!textGrouping) {
       return;
     }
@@ -117,9 +136,37 @@ function findMatches(_ref2) {
       var start = pos;
       matches.push({
         start: start,
-        end: start + nodeSize,
-        canReplace: false
+        end: start + node.nodeSize,
+        canReplace: false,
+        nodeType: node.type.name
+      });
+    }
+  };
+  var collectCardTitleMatch = function collectCardTitleMatch(node, pos) {
+    var _api$card;
+    var cards = api === null || api === void 0 || (_api$card = api.card) === null || _api$card === void 0 || (_api$card = _api$card.sharedState.currentState()) === null || _api$card === void 0 ? void 0 : _api$card.cards;
+    if (cards) {
+      var relevantCard = cards.find(function (card) {
+        return card.url === node.attrs.url;
       });
+      var title = relevantCard === null || relevantCard === void 0 ? void 0 : relevantCard.title;
+      if (relevantCard) {
+        if (title) {
+          collectNodeMatch({
+            text: title,
+            pos: 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: pos
+            }, node);
+          }
+        }
+      }
     }
   };
   if (searchTextLength > 0) {
@@ -136,7 +183,7 @@ function findMatches(_ref2) {
       } else {
         collectTextMatch(textGrouping);
         textGrouping = null;
-        if ((0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1')) {
+        if ((0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
           switch (node.type.name) {
             case 'status':
               collectStatusMatch({
@@ -145,43 +192,44 @@ function findMatches(_ref2) {
               }, node.nodeSize);
               break;
             case 'date':
-              if ((0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_part_2')) {
-                collectDateOrMentionMatch({
-                  text: (0, _utils.timestampToString)(node.attrs.timestamp, getIntl ? getIntl() : null),
-                  pos: pos
-                }, node.nodeSize);
-              }
+              collectNodeMatch({
+                text: (0, _utils.timestampToString)(node.attrs.timestamp, getIntl ? getIntl() : null),
+                pos: pos
+              }, node);
               break;
             case 'mention':
-              if ((0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_part_2')) {
-                var text;
-                if (node.attrs.text) {
-                  text = node.attrs.text;
-                } else {
-                  var _api$mention;
-                  // the text may be sanitised from the node for privacy reasons
-                  // so we need to use the mentionProvider to resolve it
-                  var mentionProvider = api === null || api === void 0 || (_api$mention = api.mention) === null || _api$mention === void 0 || (_api$mention = _api$mention.sharedState.currentState()) === null || _api$mention === void 0 ? void 0 : _api$mention.mentionProvider;
-                  if ((0, _resource.isResolvingMentionProvider)(mentionProvider)) {
-                    var nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
-                    if ((0, _types.isPromise)(nameDetail)) {
-                      text = '@...';
+              var text;
+              if (node.attrs.text) {
+                text = node.attrs.text;
+              } else {
+                var _api$mention;
+                // the text may be sanitised from the node for privacy reasons
+                // so we need to use the mentionProvider to resolve it
+                var mentionProvider = api === null || api === void 0 || (_api$mention = api.mention) === null || _api$mention === void 0 || (_api$mention = _api$mention.sharedState.currentState()) === null || _api$mention === void 0 ? void 0 : _api$mention.mentionProvider;
+                if ((0, _resource.isResolvingMentionProvider)(mentionProvider)) {
+                  var nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
+                  if ((0, _types.isPromise)(nameDetail)) {
+                    text = '@...';
+                  } else {
+                    if (nameDetail.status === _types.MentionNameStatus.OK) {
+                      text = "@".concat(nameDetail.name || '');
                     } else {
-                      if (nameDetail.status === _types.MentionNameStatus.OK) {
-                        text = "@".concat(nameDetail.name || '');
-                      } else {
-                        text = '@_|unknown|_';
-                      }
+                      text = '@_|unknown|_';
                     }
                   }
                 }
-                if (text) {
-                  collectDateOrMentionMatch({
-                    text: text,
-                    pos: pos
-                  }, node.nodeSize);
-                }
               }
+              if (text) {
+                collectNodeMatch({
+                  text: text,
+                  pos: pos
+                }, node);
+              }
+              break;
+            case 'inlineCard':
+            case 'blockCard':
+            case 'embedCard':
+              collectCardTitleMatch(node, pos);
               break;
             default:
               break;

package/dist/cjs/ui/FindReplace.js

@@ -14,6 +14,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _Find = _interopRequireDefault(require("./Find"));
 var _Replace = _interopRequireDefault(require("./Replace"));
 var _ReplaceNext = _interopRequireDefault(require("./ReplaceNext"));
@@ -148,7 +149,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: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
+          canReplace: (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? !!isReplaceable : count.total > 0,
           replaceText: replaceText,
           onReplace: onReplace,
           onReplaceAll: onReplaceAll,
@@ -163,7 +164,7 @@ var FindReplace = /*#__PURE__*/function (_React$PureComponent) {
           setFindTyped: this.setFindTyped,
           focusToolbarButton: focusToolbarButton
         }) : (0, _react2.jsx)(_Replace.default, {
-          canReplace: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? !!isReplaceable : count.total > 0,
+          canReplace: (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? !!isReplaceable : count.total > 0,
           replaceText: replaceText,
           onReplace: onReplace,
           onReplaceAll: onReplaceAll,

package/dist/cjs/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -10,7 +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 _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"));
@@ -186,8 +186,8 @@ 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) {
+    isReplaceable: (0, _expValEquals.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: (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? matches.filter(function (match) {
       return match.canReplace === true;
     }).length : undefined,
     replaceText: replaceText,

package/dist/cjs/ui/Replace.js

@@ -21,9 +21,9 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _form = require("@atlaskit/form");
 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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _FindReplaceTooltipButton = require("./FindReplaceTooltipButton");
 var _uiStyles = require("./ui-styles");
 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); }
@@ -102,7 +102,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         _this.setState({
           isHelperMessageVisible: true
         });
-        if (_this.props.count.totalReplaceable && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1')) {
+        if (_this.props.count.totalReplaceable && (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
           _this.triggerSuccessReplacementMessageUpdate(_this.props.count.totalReplaceable);
           _this.setState({
             replaceCount: _this.props.count.totalReplaceable
@@ -302,7 +302,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         testId: this.replaceAll,
         id: "replaceAll-button",
         onClick: this.handleReplaceAllClick,
-        isDisabled: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
+        isDisabled: (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? count.totalReplaceable === 0 : !canReplace
       }, this.replaceAll))), (0, _react2.jsx)("div", {
         css: _uiStyles.orderZeroStyles
       }, (0, _react2.jsx)(_new.default, {

package/dist/cjs/ui/ReplaceNext.js

@@ -15,9 +15,9 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _form = require("@atlaskit/form");
 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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _FindReplaceTooltipButton = require("./FindReplaceTooltipButton");
 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); }
 var replaceContainerStyles = (0, _primitives.xcss)({
@@ -144,7 +144,7 @@ var Replace = function Replace(_ref) {
         replaceText: replaceText
       });
       setIsHelperMessageVisible(true);
-      if (count.totalReplaceable && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1')) {
+      if (count.totalReplaceable && (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
         triggerSuccessReplacementMessageUpdate(count.totalReplaceable);
         setReplaceCount(count.totalReplaceable);
       } else {
@@ -249,7 +249,7 @@ var Replace = function Replace(_ref) {
     testId: replaceAll,
     id: "replaceAll-button",
     onClick: handleReplaceAllClick,
-    isDisabled: (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_1') ? count.totalReplaceable === 0 : !canReplace
+    isDisabled: (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? count.totalReplaceable === 0 : !canReplace
   }, replaceAll)), /*#__PURE__*/_react.default.createElement(_new.default, {
     appearance: "subtle",
     testId: closeFindReplaceDialog,

package/dist/cjs/ui/styles.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.selectedSearchMatchClass = exports.searchMatchClass = exports.findReplaceStyles = void 0;
+exports.selectedSearchMatchClass = exports.searchMatchClass = exports.findReplaceStylesNew = exports.findReplaceStyles = exports.darkModeSearchMatchClass = exports.blockSearchMatchClass = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
@@ -17,10 +17,59 @@ var _colors = require("@atlaskit/theme/colors");
 
 var searchMatchClass = exports.searchMatchClass = 'search-match';
 var selectedSearchMatchClass = exports.selectedSearchMatchClass = 'selected-search-match';
+var blockSearchMatchClass = exports.blockSearchMatchClass = 'search-match-block';
+var darkModeSearchMatchClass = exports.darkModeSearchMatchClass = 'search-match-dark';
 var findReplaceStyles = exports.findReplaceStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(searchMatchClass), {
   borderRadius: '3px',
   backgroundColor: "var(--ds-background-accent-teal-subtlest, #E7F9FF)",
   boxShadow: "var(--ds-shadow-raised, ".concat("0 1px 1px 0 ".concat(_colors.N50A, ", 0 0 1px 0 ").concat(_colors.N60A), ")") + ', inset 0 0 0 1px ' + "var(--ds-border-input, ".concat("".concat(_colors.N40A), ")")
 }), ".".concat(selectedSearchMatchClass), {
   backgroundColor: "var(--ds-background-accent-teal-subtle, #6CC3E0)"
+}));
+var findReplaceStylesNew = exports.findReplaceStylesNew = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(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))".concat(", inset 0 0 0 1px ", "var(--ds-border-input, #8590A2)")
+}), ".".concat(selectedSearchMatchClass), {
+  backgroundColor: "var(--ds-background-accent-teal-subtle, #6CC3E0)"
+}), ".".concat(blockSearchMatchClass), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+    boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-subtler, #F8E6A0)", "\n\t\t\t")
+  }
+}), ".".concat(selectedSearchMatchClass, ".").concat(blockSearchMatchClass), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+    boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", "\n\t\t\t")
+  }
+}), ".".concat(blockSearchMatchClass, ".ak-editor-selected-node"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.loader-wrapper>div::after': {
+    boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-subtler, #F8E6A0)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
+  }
+}), ".".concat(selectedSearchMatchClass, ".").concat(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: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
+  }
+}), ".".concat(blockSearchMatchClass, ".").concat(darkModeSearchMatchClass), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+    boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-bolder-pressed, #533F04)", "\n\t\t\t")
+  }
+}), ".".concat(selectedSearchMatchClass, ".").concat(blockSearchMatchClass, ".").concat(darkModeSearchMatchClass), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-smart-link-container="true"], .loader-wrapper>div::after': {
+    boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", "\n\t\t\t")
+  }
+}), ".".concat(blockSearchMatchClass, ".").concat(darkModeSearchMatchClass, ".ak-editor-selected-node"), {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.loader-wrapper>div::after': {
+    boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-bolder-pressed, #533F04)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
+  }
+}), ".".concat(selectedSearchMatchClass, ".").concat(blockSearchMatchClass, ".").concat(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: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
+  }
 }));

package/dist/es2019/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';
@@ -174,7 +174,7 @@ export const replace = replaceText => withScrollIntoView(createCommand(state =>
     findText
   } = getPluginState(state);
   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;
     }
     const {
@@ -195,7 +195,7 @@ 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')) {
+    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));
@@ -264,10 +264,10 @@ const updateSelectedHighlight = (state, nextSelectedIndex) => {
     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/es2019/pm-plugins/main.js

@@ -1,6 +1,6 @@
 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 const initialState = {
@@ -16,7 +16,7 @@ export const initialState = {
 export const createPlugin = (dispatch, getIntl, api) => {
   return new SafePlugin({
     key: findReplacePluginKey,
-    state: createPluginState(dispatch, () => fg('platform_editor_find_and_replace_part_2') ? {
+    state: createPluginState(dispatch, () => expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? {
       ...initialState,
       getIntl,
       api

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

@@ -1,4 +1,4 @@
-import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { FindReplaceActionTypes } from './actions';
 const reducer = getInitialState => (state, action) => {
   switch (action.type) {
@@ -43,7 +43,7 @@ const reducer = getInitialState => (state, action) => {
         getIntl,
         api
       } = state;
-      return fg('platform_editor_find_and_replace_part_2') ? {
+      return expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? {
         ...getInitialState(),
         getIntl,
         api