@atlaskit/editor-plugin-find-replace 14.0.1 → 14.0.2

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

@@ -8,10 +8,9 @@ import { NodeSelection, 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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getGlobalTheme } from '@atlaskit/tokens/get-global-theme';
-import { searchMatchClass, selectedSearchMatchClass, blockSearchMatchClass, darkModeSearchMatchClass, selectedBlockSearchMatchClass, searchMatchExpandTitleClass, searchMatchTextClass } from '../../ui/styles';
+import { selectedSearchMatchClass, blockSearchMatchClass, darkModeSearchMatchClass, selectedBlockSearchMatchClass, searchMatchExpandTitleClass, searchMatchTextClass } from '../../ui/styles';
 
 /**
  * Recursively extracts all text content from an ADF entity tree.
@@ -79,32 +78,22 @@ export var createDecoration = function createDecoration(match, isSelected) {
   var start = match.start,
     end = match.end,
     nodeType = match.nodeType;
-  if (expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
-    var _getGlobalTheme = getGlobalTheme(),
-      colorMode = _getGlobalTheme.colorMode;
-    if (isElement(nodeType)) {
-      var className = classnames(blockSearchMatchClass, _defineProperty(_defineProperty({}, selectedBlockSearchMatchClass, isSelected), darkModeSearchMatchClass, colorMode === 'dark'));
-      return Decoration.node(start, end, {
-        class: className
-      });
-    } else if (isExpandTitle(match)) {
-      var _className = classnames(searchMatchExpandTitleClass, _defineProperty(_defineProperty({}, selectedSearchMatchClass, isSelected), darkModeSearchMatchClass, colorMode === 'dark'));
-      return Decoration.node(start, end, {
-        class: _className
-      });
-    } else {
-      var _className2 = classnames(searchMatchTextClass, _defineProperty(_defineProperty({}, selectedSearchMatchClass, isSelected), darkModeSearchMatchClass, colorMode === 'dark'));
-      return Decoration.inline(start, end, {
-        class: _className2
-      });
-    }
+  var _getGlobalTheme = getGlobalTheme(),
+    colorMode = _getGlobalTheme.colorMode;
+  if (isElement(nodeType)) {
+    var className = classnames(blockSearchMatchClass, _defineProperty(_defineProperty({}, selectedBlockSearchMatchClass, isSelected), darkModeSearchMatchClass, colorMode === 'dark'));
+    return Decoration.node(start, end, {
+      class: className
+    });
+  } else if (isExpandTitle(match)) {
+    var _className = classnames(searchMatchExpandTitleClass, _defineProperty(_defineProperty({}, selectedSearchMatchClass, isSelected), darkModeSearchMatchClass, colorMode === 'dark'));
+    return Decoration.node(start, end, {
+      class: _className
+    });
   } else {
-    var _className3 = searchMatchClass;
-    if (isSelected) {
-      _className3 += " ".concat(selectedSearchMatchClass);
-    }
+    var _className2 = classnames(searchMatchTextClass, _defineProperty(_defineProperty({}, selectedSearchMatchClass, isSelected), darkModeSearchMatchClass, colorMode === 'dark'));
     return Decoration.inline(start, end, {
-      class: _className3
+      class: _className2
     });
   }
 };
@@ -138,8 +127,8 @@ export function findMatches(_ref2) {
       matches.push({
         start: pos + index,
         end: pos + end,
-        canReplace: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? true : undefined,
-        nodeType: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? 'text' : undefined
+        canReplace: true,
+        nodeType: 'text'
       });
       index = text.indexOf(searchText, end);
     }
@@ -207,83 +196,81 @@ export function findMatches(_ref2) {
       } else {
         collectTextMatch(textGrouping);
         textGrouping = null;
-        if (expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
-          switch (node.type.name) {
-            case 'status':
-              collectNodeMatch({
-                text: node.attrs.text,
-                pos: pos
-              }, node);
-              break;
-            case 'date':
-              collectNodeMatch({
-                text: timestampToString(node.attrs.timestamp, getIntl ? getIntl() : null),
-                pos: pos
-              }, node);
-              break;
-            case 'expand':
-            case 'nestedExpand':
-              collectNodeMatch({
-                text: node.attrs.title,
-                pos: pos
-              }, node);
-              break;
-            case 'mention':
-              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 (isResolvingMentionProvider(mentionProvider)) {
-                  var nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
-                  if (isPromise(nameDetail)) {
-                    text = '@...';
+        switch (node.type.name) {
+          case 'status':
+            collectNodeMatch({
+              text: node.attrs.text,
+              pos: pos
+            }, node);
+            break;
+          case 'date':
+            collectNodeMatch({
+              text: timestampToString(node.attrs.timestamp, getIntl ? getIntl() : null),
+              pos: pos
+            }, node);
+            break;
+          case 'expand':
+          case 'nestedExpand':
+            collectNodeMatch({
+              text: node.attrs.title,
+              pos: pos
+            }, node);
+            break;
+          case 'mention':
+            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 (isResolvingMentionProvider(mentionProvider)) {
+                var nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
+                if (isPromise(nameDetail)) {
+                  text = '@...';
+                } else {
+                  if (nameDetail.status === MentionNameStatus.OK) {
+                    text = "@".concat(nameDetail.name || '');
                   } else {
-                    if (nameDetail.status === MentionNameStatus.OK) {
-                      text = "@".concat(nameDetail.name || '');
-                    } else {
-                      text = '@_|unknown|_';
-                    }
+                    text = '@_|unknown|_';
                   }
                 }
               }
-              if (text) {
-                collectNodeMatch({
-                  text: text,
-                  pos: pos
-                }, node);
-              }
-              break;
-            case 'inlineCard':
-            case 'blockCard':
-            case 'embedCard':
-              collectCardTitleMatch(node, pos);
-              break;
-            case 'syncBlock':
-              {
-                if (editorExperiment('platform_synced_block', true)) {
-                  var _api$syncedBlock, _instance$data;
-                  var syncBlockStore = api === null || api === void 0 || (_api$syncedBlock = api.syncedBlock) === null || _api$syncedBlock === void 0 || (_api$syncedBlock = _api$syncedBlock.sharedState.currentState()) === null || _api$syncedBlock === void 0 ? void 0 : _api$syncedBlock.syncBlockStore;
-                  var instance = syncBlockStore === null || syncBlockStore === void 0 ? void 0 : syncBlockStore.referenceManager.getFromCache(node.attrs.resourceId);
-                  var adfContent = instance === null || instance === void 0 || (_instance$data = instance.data) === null || _instance$data === void 0 ? void 0 : _instance$data.content;
-                  if (adfContent && adfContent.length > 0) {
-                    var _text = extractTextFromADFContent(adfContent);
-                    if (_text) {
-                      collectNodeMatch({
-                        text: _text,
-                        pos: pos
-                      }, node);
-                    }
+            }
+            if (text) {
+              collectNodeMatch({
+                text: text,
+                pos: pos
+              }, node);
+            }
+            break;
+          case 'inlineCard':
+          case 'blockCard':
+          case 'embedCard':
+            collectCardTitleMatch(node, pos);
+            break;
+          case 'syncBlock':
+            {
+              if (editorExperiment('platform_synced_block', true)) {
+                var _api$syncedBlock, _instance$data;
+                var syncBlockStore = api === null || api === void 0 || (_api$syncedBlock = api.syncedBlock) === null || _api$syncedBlock === void 0 || (_api$syncedBlock = _api$syncedBlock.sharedState.currentState()) === null || _api$syncedBlock === void 0 ? void 0 : _api$syncedBlock.syncBlockStore;
+                var instance = syncBlockStore === null || syncBlockStore === void 0 ? void 0 : syncBlockStore.referenceManager.getFromCache(node.attrs.resourceId);
+                var adfContent = instance === null || instance === void 0 || (_instance$data = instance.data) === null || _instance$data === void 0 ? void 0 : _instance$data.content;
+                if (adfContent && adfContent.length > 0) {
+                  var _text = extractTextFromADFContent(adfContent);
+                  if (_text) {
+                    collectNodeMatch({
+                      text: _text,
+                      pos: pos
+                    }, node);
                   }
                 }
-                break;
               }
-            default:
               break;
-          }
+            }
+          default:
+            break;
         }
       }
     });

package/dist/esm/ui/Find.js

@@ -22,7 +22,6 @@ import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { findReplaceMessages as messages } from '@atlaskit/editor-common/messages';
 import { Label } from '@atlaskit/form';
 import TextLetterCaseIcon from '@atlaskit/icon-lab/core/text-letter-case';
-import MatchCaseIcon from '@atlaskit/icon/core/text-style';
 import Textfield from '@atlaskit/textfield';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
@@ -139,11 +138,9 @@ var Find = /*#__PURE__*/function (_React$Component) {
       }
     });
     _defineProperty(_this, "matchCaseIconEle", function (iconProps) {
-      return expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? jsx(TextLetterCaseIcon, {
+      return jsx(TextLetterCaseIcon, {
         label: iconProps.label,
         size: "small"
-      }) : jsx(MatchCaseIcon, {
-        label: _this.matchCase
       });
     });
     var formatMessage = props.intl.formatMessage;

package/dist/esm/ui/FindReplace.js

@@ -17,7 +17,6 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
 import { findReplaceMessages as messages } from '@atlaskit/editor-common/messages';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Find from './Find';
 import Replace from './Replace';
 import { ruleStyles, wrapperPaddingStyles, wrapperStyles } from './ui-styles';
@@ -108,7 +107,7 @@ var FindReplace = /*#__PURE__*/function (_React$PureComponent) {
         css: ruleStyles,
         id: "replace-hr-element"
       }), jsx(Replace, {
-        canReplace: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? !!isReplaceable : count.total > 0,
+        canReplace: !!isReplaceable,
         replaceText: replaceText,
         onReplace: onReplace,
         onReplaceAll: onReplaceAll,

package/dist/esm/ui/FindReplaceDropDownOrToolbarButtonWithState.js

@@ -1,7 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useLayoutEffect, useState } from 'react';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
-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';
@@ -147,12 +146,12 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     findText: findText,
     index: index,
     numMatches: matches.length,
-    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) ?
+    isReplaceable: (_matches$index = matches[index]) === null || _matches$index === void 0 ? void 0 : _matches$index.canReplace,
+    numReplaceable:
     // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
     matches.filter(function (match) {
       return match.canReplace === true;
-    }).length : undefined,
+    }).length,
     replaceText: replaceText,
     shouldFocus: shouldFocus,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/esm/ui/Replace.js

@@ -10,7 +10,6 @@ import ChevronUpIcon from '@atlaskit/icon/core/chevron-up';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 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';
 
 // @ts-ignore - TS1501 TypeScript 5.9.2 upgrade
@@ -25,13 +24,10 @@ var actionButtonContainerStyles = xcss({
   paddingTop: 'space.200'
 });
 var actionButtonParentInlineStyles = xcss({
-  justifyContent: 'space-between',
-  flexDirection: 'row-reverse'
-});
-var actionButtonParentInlineStylesNew = xcss({
   justifyContent: 'space-between',
   flexDirection: 'row-reverse',
-  flexWrap: 'wrap'
+  flexWrap: 'wrap',
+  gap: 'space.075'
 });
 var actionButtonInlineStyles = xcss({
   gap: 'space.075'
@@ -147,7 +143,7 @@ var Replace = function Replace(_ref) {
         replaceText: replaceText
       });
       setIsHelperMessageVisible(true);
-      if (count.totalReplaceable && expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+      if (count.totalReplaceable) {
         triggerSuccessReplacementMessageUpdate(count.totalReplaceable);
         setReplaceCount(count.totalReplaceable);
       } else {
@@ -218,7 +214,7 @@ var Replace = function Replace(_ref) {
   resultsReplace.replace(SPACE_REGEX, "\xA0") : resultsReplace)), /*#__PURE__*/React.createElement(Box, {
     xcss: actionButtonContainerStyles
   }, /*#__PURE__*/React.createElement(Inline, {
-    xcss: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? [actionButtonInlineStyles, actionButtonParentInlineStylesNew] : [actionButtonInlineStyles, actionButtonParentInlineStyles]
+    xcss: actionButtonParentInlineStyles
   }, /*#__PURE__*/React.createElement(Inline, {
     xcss: actionButtonInlineStyles
   }, /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
@@ -259,18 +255,14 @@ var Replace = function Replace(_ref) {
     testId: replaceAll,
     id: "replaceAll-button",
     onClick: handleReplaceAllClick,
-    isDisabled: expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? count.totalReplaceable === 0 : !canReplace
-  }, replaceAll)), expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? /*#__PURE__*/React.createElement(Inline, {
+    isDisabled: count.totalReplaceable === 0
+  }, replaceAll)), /*#__PURE__*/React.createElement(Inline, {
     xcss: closeButtonInlineStyles
   }, /*#__PURE__*/React.createElement(Button, {
     appearance: "subtle",
     testId: closeFindReplaceDialog,
     onClick: clearSearch
-  }, closeFindReplaceDialog)) : /*#__PURE__*/React.createElement(Button, {
-    appearance: "subtle",
-    testId: closeFindReplaceDialog,
-    onClick: clearSearch
-  }, closeFindReplaceDialog))));
+  }, closeFindReplaceDialog)))));
 };
 
 // eslint-disable-next-line @typescript-eslint/ban-types

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-find-replace",
-	"version": "14.0.1",
+	"version": "14.0.2",
 	"description": "find replace plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,11 +32,11 @@
 		"@atlaskit/form": "^16.1.0",
 		"@atlaskit/icon": "^37.3.0",
 		"@atlaskit/icon-lab": "^7.5.0",
-		"@atlaskit/mention": "^27.13.0",
+		"@atlaskit/mention": "^27.14.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/primitives": "^22.2.0",
 		"@atlaskit/textfield": "^10.0.0",
-		"@atlaskit/tmp-editor-statsig": "^143.0.0",
+		"@atlaskit/tmp-editor-statsig": "^144.0.0",
 		"@atlaskit/tokens": "^16.4.0",
 		"@atlaskit/tooltip": "^24.0.0",
 		"@babel/runtime": "^7.0.0",