@atlaskit/editor-plugin-find-replace 1.2.7 → 1.2.8

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 1.2.8
+
+### Patch Changes
+
+-   [#104260](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/104260)
+    [`2050e35bc9d5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2050e35bc9d5) -
+    Removing feature flag `platform.design-system.editor-new-button_jjjdo` in
+    `@atlaskit/editor-plugin-find-replace` so the affected Buttons are using new Atlaskit Buttons by
+    default.
+
 ## 1.2.7
 
 ### Patch Changes

package/dist/cjs/ui/Find.js

@@ -147,19 +147,6 @@ var Find = /*#__PURE__*/function (_React$Component) {
     _this.findNext = formatMessage(_messages.findReplaceMessages.findNext);
     _this.findPrevious = formatMessage(_messages.findReplaceMessages.findPrevious);
     _this.matchCase = formatMessage(_messages.findReplaceMessages.matchCase);
-    _this.matchCaseIcon = (0, _react2.jsx)(_keyboard.default, {
-      label: _this.matchCase,
-      size: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-find-replace') ? 'small' : 'medium'
-    });
-    _this.findNextIcon = (0, _react2.jsx)(_chevronDown.default, {
-      label: _this.findNext
-    });
-    _this.findPrevIcon = (0, _react2.jsx)(_chevronUp.default, {
-      label: _this.findPrevious
-    });
-    _this.closeIcon = (0, _react2.jsx)(_close.default, {
-      label: _this.closeFindReplaceDialog
-    });
 
     // We locally manage the value of the input inside this component in order to support compositions.
     // This requires some additional work inside componentDidUpdate to ensure we support changes that
@@ -235,8 +222,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
         }, (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
           title: this.matchCase,
           appearance: "default",
-          icon: this.matchCaseIcon,
-          newIcon: _keyboard.default,
+          icon: _keyboard.default,
           iconLabel: this.matchCase,
           iconSize: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-find-replace') ? 'small' : undefined,
           onClick: this.handleMatchCaseClick,
@@ -287,32 +273,28 @@ var Find = /*#__PURE__*/function (_React$Component) {
           css: _styles.countStyles
         }, count.total === 0 ? this.noResultsFound : resultsCount)), (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
           title: this.matchCase,
-          icon: this.matchCaseIcon,
-          newIcon: _keyboard.default,
+          icon: _keyboard.default,
           iconLabel: this.matchCase,
           iconSize: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-find-replace') ? 'small' : undefined,
           onClick: this.handleMatchCaseClick,
           isPressed: shouldMatchCase
         }), (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
           title: this.findNext,
-          icon: this.findNextIcon,
-          newIcon: _chevronDown.default,
+          icon: _chevronDown.default,
           iconLabel: this.findNext,
           keymapDescription: 'Enter',
           onClick: this.handleFindNextClick,
           disabled: count.total <= 1
         }), (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
           title: this.findPrevious,
-          icon: this.findPrevIcon,
-          newIcon: _chevronUp.default,
+          icon: _chevronUp.default,
           iconLabel: this.findPrevious,
           keymapDescription: 'Shift Enter',
           onClick: this.handleFindPrevClick,
           disabled: count.total <= 1
         }), (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
           title: this.closeFindReplaceDialog,
-          icon: this.closeIcon,
-          newIcon: _close.default,
+          icon: _close.default,
           iconLabel: this.closeFindReplaceDialog,
           keymapDescription: 'Escape',
           onClick: this.clearSearch

package/dist/cjs/ui/FindReplaceTooltipButton.js

@@ -15,9 +15,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _new = require("@atlaskit/button/new");
-var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 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; }
@@ -46,7 +44,6 @@ var FindReplaceTooltipButton = exports.FindReplaceTooltipButton = /*#__PURE__*/f
       var _this$props = this.props,
         title = _this$props.title,
         icon = _this$props.icon,
-        newIcon = _this$props.newIcon,
         iconSize = _this$props.iconSize,
         keymapDescription = _this$props.keymapDescription,
         disabled = _this$props.disabled,
@@ -62,28 +59,17 @@ var FindReplaceTooltipButton = exports.FindReplaceTooltipButton = /*#__PURE__*/f
         }),
         hideTooltipOnClick: true,
         position: 'top'
-      }, (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.editor-new-button_jjjdo') ? /*#__PURE__*/_react.default.createElement(_new.IconButton, (0, _extends2.default)({
+      }, /*#__PURE__*/_react.default.createElement(_new.IconButton, (0, _extends2.default)({
         id: "afterInputSection",
         label: title,
         appearance: appearance,
         testId: title,
         ref: this.buttonRef,
-        icon: newIcon,
+        icon: icon,
         UNSAFE_size: iconSize,
         isDisabled: disabled,
         onClick: this.handleClick,
         isSelected: isPressed
-      }, pressedProps)) : /*#__PURE__*/_react.default.createElement(_standardButton.default, (0, _extends2.default)({
-        id: "afterInputSection",
-        label: title,
-        appearance: appearance,
-        testId: title,
-        ref: this.buttonRef,
-        iconBefore: icon,
-        isDisabled: disabled,
-        onClick: this.handleClick,
-        isSelected: isPressed,
-        shouldFitContainer: true
       }, pressedProps)));
     }
   }]);

package/dist/cjs/ui/Replace.js

@@ -17,7 +17,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _new = _interopRequireDefault(require("@atlaskit/button/new"));
-var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _form = require("@atlaskit/form");
@@ -159,12 +158,6 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
     _this.replaceAll = formatMessage(_messages.findReplaceMessages.replaceAll);
     _this.findNext = formatMessage(_messages.findReplaceMessages.findNext);
     _this.findPrevious = formatMessage(_messages.findReplaceMessages.findPrevious);
-    _this.findNextIcon = (0, _react2.jsx)(_chevronDown.default, {
-      label: _this.findNext
-    });
-    _this.findPrevIcon = (0, _react2.jsx)(_chevronUp.default, {
-      label: _this.findPrevious
-    });
     _this.closeFindReplaceDialog = formatMessage(_messages.findReplaceMessages.closeFindReplaceDialog);
     return _this;
   }
@@ -222,7 +215,6 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
       var resultsReplace = formatMessage(_messages.findReplaceMessages.replaceSuccess, {
         numberOfMatches: replaceCount
       });
-      var replaceSectionButtonStyles = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-find-replace') ? _styles.replaceSectionButtonNewStyles : _styles.replaceSectionButtonOldStyles;
       return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-find-replace') ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)("div", {
         css: [_styles.sectionWrapperStyles, _styles.sectionWrapperStylesAlternate]
       }, (0, _react2.jsx)("div", {
@@ -257,8 +249,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         css: _styles.nextPreviousItemStyles
       }, (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
         title: this.findNext,
-        icon: this.findNextIcon,
-        newIcon: _chevronDown.default,
+        icon: _chevronDown.default,
         iconLabel: this.findNext,
         keymapDescription: 'Enter',
         onClick: this.handleFindNextClick,
@@ -267,13 +258,12 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         css: _styles.nextPreviousItemStyles
       }, (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
         title: this.findPrevious,
-        icon: this.findPrevIcon,
-        newIcon: _chevronUp.default,
+        icon: _chevronUp.default,
         iconLabel: this.findPrevious,
         keymapDescription: 'Shift Enter',
         onClick: this.handleFindPrevClick,
         disabled: count.total <= 1
-      })), (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.editor-new-button_jjjdo') ? (0, _react2.jsx)(_primitives.Inline, {
+      })), (0, _react2.jsx)(_primitives.Inline, {
         space: "space.075",
         xcss: (0, _primitives.xcss)({
           // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
@@ -292,27 +282,9 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         id: "replaceAll-button",
         onClick: this.handleReplaceAllClick,
         isDisabled: !canReplace
-      }, this.replaceAll)) : (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_standardButton.default, {
-        css: replaceSectionButtonStyles,
-        testId: this.replace,
-        id: "replace-button",
-        onClick: this.handleReplaceClick,
-        isDisabled: !canReplace
-      }, this.replace), (0, _react2.jsx)(_standardButton.default, {
-        css: replaceSectionButtonStyles,
-        appearance: "primary",
-        testId: this.replaceAll,
-        id: "replaceAll-button",
-        onClick: this.handleReplaceAllClick,
-        isDisabled: !canReplace
       }, this.replaceAll))), (0, _react2.jsx)("div", {
-        css: (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.editor-new-button_jjjdo') ? _styles.orderZeroStyles : _styles.orderZeroDeprecatedStyles
-      }, (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.editor-new-button_jjjdo') ? (0, _react2.jsx)(_new.default, {
-        appearance: "subtle",
-        testId: this.closeFindReplaceDialog,
-        onClick: this.clearSearch
-      }, this.closeFindReplaceDialog) : (0, _react2.jsx)(_standardButton.default, {
-        css: replaceSectionButtonStyles,
+        css: _styles.orderZeroStyles
+      }, (0, _react2.jsx)(_new.default, {
         appearance: "subtle",
         testId: this.closeFindReplaceDialog,
         onClick: this.clearSearch
@@ -329,7 +301,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         onKeyDown: this.handleReplaceKeyDown,
         onCompositionStart: this.handleCompositionStart,
         onCompositionEnd: this.handleCompositionEnd
-      }), (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.editor-new-button_jjjdo') ? (0, _react2.jsx)(_primitives.Inline, {
+      }), (0, _react2.jsx)(_primitives.Inline, {
         space: "space.050"
       }, (0, _react2.jsx)(_new.default, {
         testId: this.replace,
@@ -339,16 +311,6 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         testId: this.replaceAll,
         onClick: this.handleReplaceAllClick,
         isDisabled: !canReplace
-      }, this.replaceAll)) : (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_standardButton.default, {
-        css: replaceSectionButtonStyles,
-        testId: this.replace,
-        onClick: this.handleReplaceClick,
-        isDisabled: !canReplace
-      }, this.replace), (0, _react2.jsx)(_standardButton.default, {
-        css: replaceSectionButtonStyles,
-        testId: this.replaceAll,
-        onClick: this.handleReplaceAllClick,
-        isDisabled: !canReplace
       }, this.replaceAll)));
     }
   }]);

package/dist/cjs/ui/styles.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wrapperStyles = exports.wrapperPaddingStyles = exports.textFieldWrapper = exports.sectionWrapperStylesAlternate = exports.sectionWrapperStyles = exports.sectionWrapperJustified = exports.ruleStyles = exports.replaceSectionButtonOldStyles = exports.replaceSectionButtonNewStyles = exports.orderZeroStyles = exports.orderZeroDeprecatedStyles = exports.orderOneStyles = exports.nextPreviousItemStyles = exports.matchCaseSection = exports.countWrapperStyles = exports.countStylesAlternateStyles = exports.countStyles = exports.afterInputSection = void 0;
+exports.wrapperStyles = exports.wrapperPaddingStyles = exports.textFieldWrapper = exports.sectionWrapperStylesAlternate = exports.sectionWrapperStyles = exports.sectionWrapperJustified = exports.ruleStyles = exports.orderZeroStyles = exports.orderOneStyles = exports.nextPreviousItemStyles = exports.matchCaseSection = exports.countWrapperStyles = exports.countStylesAlternateStyles = exports.countStyles = exports.afterInputSection = void 0;
 var _react = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _colors = require("@atlaskit/theme/colors");
@@ -14,13 +14,6 @@ var _constants = require("@atlaskit/theme/constants");
 
 var fontSize = (0, _constants.fontSize)();
 var gridSize = (0, _constants.gridSize)();
-var replaceSectionButtonNewStyles = exports.replaceSectionButtonNewStyles = (0, _react.css)({
-  marginLeft: "var(--ds-space-050, 4px)",
-  marginRight: "var(--ds-space-050, 2px)"
-});
-var replaceSectionButtonOldStyles = exports.replaceSectionButtonOldStyles = (0, _react.css)({
-  marginLeft: "var(--ds-space-050, 4px)"
-});
 var ruleStyles = exports.ruleStyles = (0, _react.css)({
   width: '100%',
   border: 'none',
@@ -108,10 +101,6 @@ var orderZeroStyles = exports.orderZeroStyles = (0, _react.css)({
   order: '0',
   marginInline: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-025, 2px)")
 });
-var orderZeroDeprecatedStyles = exports.orderZeroDeprecatedStyles = (0, _react.css)({
-  order: '0',
-  marginInline: 0
-});
 var orderOneStyles = exports.orderOneStyles = (0, _react.css)({
   order: '1'
 });

package/dist/es2019/ui/Find.js

@@ -134,19 +134,6 @@ class Find extends React.Component {
     this.findNext = formatMessage(messages.findNext);
     this.findPrevious = formatMessage(messages.findPrevious);
     this.matchCase = formatMessage(messages.matchCase);
-    this.matchCaseIcon = jsx(MatchCaseIcon, {
-      label: this.matchCase,
-      size: getBooleanFF('platform.editor.a11y-find-replace') ? 'small' : 'medium'
-    });
-    this.findNextIcon = jsx(ChevronDownIcon, {
-      label: this.findNext
-    });
-    this.findPrevIcon = jsx(ChevronUpIcon, {
-      label: this.findPrevious
-    });
-    this.closeIcon = jsx(EditorCloseIcon, {
-      label: this.closeFindReplaceDialog
-    });
 
     // We locally manage the value of the input inside this component in order to support compositions.
     // This requires some additional work inside componentDidUpdate to ensure we support changes that
@@ -214,8 +201,7 @@ class Find extends React.Component {
       }, jsx(FindReplaceTooltipButton, {
         title: this.matchCase,
         appearance: "default",
-        icon: this.matchCaseIcon,
-        newIcon: MatchCaseIcon,
+        icon: MatchCaseIcon,
         iconLabel: this.matchCase,
         iconSize: getBooleanFF('platform.editor.a11y-find-replace') ? 'small' : undefined,
         onClick: this.handleMatchCaseClick,
@@ -266,32 +252,28 @@ class Find extends React.Component {
         css: countStyles
       }, count.total === 0 ? this.noResultsFound : resultsCount)), jsx(FindReplaceTooltipButton, {
         title: this.matchCase,
-        icon: this.matchCaseIcon,
-        newIcon: MatchCaseIcon,
+        icon: MatchCaseIcon,
         iconLabel: this.matchCase,
         iconSize: getBooleanFF('platform.editor.a11y-find-replace') ? 'small' : undefined,
         onClick: this.handleMatchCaseClick,
         isPressed: shouldMatchCase
       }), jsx(FindReplaceTooltipButton, {
         title: this.findNext,
-        icon: this.findNextIcon,
-        newIcon: ChevronDownIcon,
+        icon: ChevronDownIcon,
         iconLabel: this.findNext,
         keymapDescription: 'Enter',
         onClick: this.handleFindNextClick,
         disabled: count.total <= 1
       }), jsx(FindReplaceTooltipButton, {
         title: this.findPrevious,
-        icon: this.findPrevIcon,
-        newIcon: ChevronUpIcon,
+        icon: ChevronUpIcon,
         iconLabel: this.findPrevious,
         keymapDescription: 'Shift Enter',
         onClick: this.handleFindPrevClick,
         disabled: count.total <= 1
       }), jsx(FindReplaceTooltipButton, {
         title: this.closeFindReplaceDialog,
-        icon: this.closeIcon,
-        newIcon: EditorCloseIcon,
+        icon: EditorCloseIcon,
         iconLabel: this.closeFindReplaceDialog,
         keymapDescription: 'Escape',
         onClick: this.clearSearch

package/dist/es2019/ui/FindReplaceTooltipButton.js

@@ -2,9 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { IconButton } from '@atlaskit/button/new';
-import LegacyButton from '@atlaskit/button/standard-button';
 import { findKeymapByDescription, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Tooltip from '@atlaskit/tooltip';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class FindReplaceTooltipButton extends React.PureComponent {
@@ -19,7 +17,6 @@ export class FindReplaceTooltipButton extends React.PureComponent {
     const {
       title,
       icon,
-      newIcon,
       iconSize,
       keymapDescription,
       disabled,
@@ -38,28 +35,17 @@ export class FindReplaceTooltipButton extends React.PureComponent {
       }),
       hideTooltipOnClick: true,
       position: 'top'
-    }, getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? /*#__PURE__*/React.createElement(IconButton, _extends({
+    }, /*#__PURE__*/React.createElement(IconButton, _extends({
       id: "afterInputSection",
       label: title,
       appearance: appearance,
       testId: title,
       ref: this.buttonRef,
-      icon: newIcon,
+      icon: icon,
       UNSAFE_size: iconSize,
       isDisabled: disabled,
       onClick: this.handleClick,
       isSelected: isPressed
-    }, pressedProps)) : /*#__PURE__*/React.createElement(LegacyButton, _extends({
-      id: "afterInputSection",
-      label: title,
-      appearance: appearance,
-      testId: title,
-      ref: this.buttonRef,
-      iconBefore: icon,
-      isDisabled: disabled,
-      onClick: this.handleClick,
-      isSelected: isPressed,
-      shouldFitContainer: true
     }, pressedProps)));
   }
 }

package/dist/es2019/ui/Replace.js

@@ -5,7 +5,6 @@ import React, { Fragment } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/new';
-import LegacyButton from '@atlaskit/button/standard-button';
 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';
@@ -15,7 +14,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Inline, xcss } from '@atlaskit/primitives';
 import Textfield from '@atlaskit/textfield';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
-import { nextPreviousItemStyles, orderOneStyles, orderZeroDeprecatedStyles, orderZeroStyles, replaceSectionButtonNewStyles, replaceSectionButtonOldStyles, sectionWrapperJustified, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
+import { nextPreviousItemStyles, orderOneStyles, orderZeroStyles, sectionWrapperJustified, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 class Replace extends React.PureComponent {
   constructor(props) {
@@ -137,12 +136,6 @@ class Replace extends React.PureComponent {
     this.replaceAll = formatMessage(messages.replaceAll);
     this.findNext = formatMessage(messages.findNext);
     this.findPrevious = formatMessage(messages.findPrevious);
-    this.findNextIcon = jsx(ChevronDownIcon, {
-      label: this.findNext
-    });
-    this.findPrevIcon = jsx(ChevronUpIcon, {
-      label: this.findPrevious
-    });
     this.closeFindReplaceDialog = formatMessage(messages.closeFindReplaceDialog);
   }
   componentDidMount() {
@@ -198,7 +191,6 @@ class Replace extends React.PureComponent {
     const resultsReplace = formatMessage(messages.replaceSuccess, {
       numberOfMatches: replaceCount
     });
-    const replaceSectionButtonStyles = getBooleanFF('platform.editor.a11y-find-replace') ? replaceSectionButtonNewStyles : replaceSectionButtonOldStyles;
     return getBooleanFF('platform.editor.a11y-find-replace') ? jsx(Fragment, null, jsx("div", {
       css: [sectionWrapperStyles, sectionWrapperStylesAlternate]
     }, jsx("div", {
@@ -233,8 +225,7 @@ class Replace extends React.PureComponent {
       css: nextPreviousItemStyles
     }, jsx(FindReplaceTooltipButton, {
       title: this.findNext,
-      icon: this.findNextIcon,
-      newIcon: ChevronDownIcon,
+      icon: ChevronDownIcon,
       iconLabel: this.findNext,
       keymapDescription: 'Enter',
       onClick: this.handleFindNextClick,
@@ -243,13 +234,12 @@ class Replace extends React.PureComponent {
       css: nextPreviousItemStyles
     }, jsx(FindReplaceTooltipButton, {
       title: this.findPrevious,
-      icon: this.findPrevIcon,
-      newIcon: ChevronUpIcon,
+      icon: ChevronUpIcon,
       iconLabel: this.findPrevious,
       keymapDescription: 'Shift Enter',
       onClick: this.handleFindPrevClick,
       disabled: count.total <= 1
-    })), getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? jsx(Inline, {
+    })), jsx(Inline, {
       space: "space.075",
       xcss: xcss({
         // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
@@ -268,27 +258,9 @@ class Replace extends React.PureComponent {
       id: "replaceAll-button",
       onClick: this.handleReplaceAllClick,
       isDisabled: !canReplace
-    }, this.replaceAll)) : jsx(Fragment, null, jsx(LegacyButton, {
-      css: replaceSectionButtonStyles,
-      testId: this.replace,
-      id: "replace-button",
-      onClick: this.handleReplaceClick,
-      isDisabled: !canReplace
-    }, this.replace), jsx(LegacyButton, {
-      css: replaceSectionButtonStyles,
-      appearance: "primary",
-      testId: this.replaceAll,
-      id: "replaceAll-button",
-      onClick: this.handleReplaceAllClick,
-      isDisabled: !canReplace
     }, this.replaceAll))), jsx("div", {
-      css: getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? orderZeroStyles : orderZeroDeprecatedStyles
-    }, getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? jsx(Button, {
-      appearance: "subtle",
-      testId: this.closeFindReplaceDialog,
-      onClick: this.clearSearch
-    }, this.closeFindReplaceDialog) : jsx(LegacyButton, {
-      css: replaceSectionButtonStyles,
+      css: orderZeroStyles
+    }, jsx(Button, {
       appearance: "subtle",
       testId: this.closeFindReplaceDialog,
       onClick: this.clearSearch
@@ -305,7 +277,7 @@ class Replace extends React.PureComponent {
       onKeyDown: this.handleReplaceKeyDown,
       onCompositionStart: this.handleCompositionStart,
       onCompositionEnd: this.handleCompositionEnd
-    }), getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? jsx(Inline, {
+    }), jsx(Inline, {
       space: "space.050"
     }, jsx(Button, {
       testId: this.replace,
@@ -315,16 +287,6 @@ class Replace extends React.PureComponent {
       testId: this.replaceAll,
       onClick: this.handleReplaceAllClick,
       isDisabled: !canReplace
-    }, this.replaceAll)) : jsx(Fragment, null, jsx(LegacyButton, {
-      css: replaceSectionButtonStyles,
-      testId: this.replace,
-      onClick: this.handleReplaceClick,
-      isDisabled: !canReplace
-    }, this.replace), jsx(LegacyButton, {
-      css: replaceSectionButtonStyles,
-      testId: this.replaceAll,
-      onClick: this.handleReplaceAllClick,
-      isDisabled: !canReplace
     }, this.replaceAll)));
   }
 }

package/dist/es2019/ui/styles.js

@@ -9,13 +9,6 @@ import { fontSize as getFontSize,
 gridSize as getGridSize } from '@atlaskit/theme/constants';
 const fontSize = getFontSize();
 const gridSize = getGridSize();
-export const replaceSectionButtonNewStyles = css({
-  marginLeft: "var(--ds-space-050, 4px)",
-  marginRight: "var(--ds-space-050, 2px)"
-});
-export const replaceSectionButtonOldStyles = css({
-  marginLeft: "var(--ds-space-050, 4px)"
-});
 export const ruleStyles = css({
   width: '100%',
   border: 'none',
@@ -103,10 +96,6 @@ export const orderZeroStyles = css({
   order: '0',
   marginInline: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-025, 2px)"}`
 });
-export const orderZeroDeprecatedStyles = css({
-  order: '0',
-  marginInline: 0
-});
 export const orderOneStyles = css({
   order: '1'
 });

package/dist/esm/ui/Find.js

@@ -142,19 +142,6 @@ var Find = /*#__PURE__*/function (_React$Component) {
     _this.findNext = formatMessage(messages.findNext);
     _this.findPrevious = formatMessage(messages.findPrevious);
     _this.matchCase = formatMessage(messages.matchCase);
-    _this.matchCaseIcon = jsx(MatchCaseIcon, {
-      label: _this.matchCase,
-      size: getBooleanFF('platform.editor.a11y-find-replace') ? 'small' : 'medium'
-    });
-    _this.findNextIcon = jsx(ChevronDownIcon, {
-      label: _this.findNext
-    });
-    _this.findPrevIcon = jsx(ChevronUpIcon, {
-      label: _this.findPrevious
-    });
-    _this.closeIcon = jsx(EditorCloseIcon, {
-      label: _this.closeFindReplaceDialog
-    });
 
     // We locally manage the value of the input inside this component in order to support compositions.
     // This requires some additional work inside componentDidUpdate to ensure we support changes that
@@ -230,8 +217,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
         }, jsx(FindReplaceTooltipButton, {
           title: this.matchCase,
           appearance: "default",
-          icon: this.matchCaseIcon,
-          newIcon: MatchCaseIcon,
+          icon: MatchCaseIcon,
           iconLabel: this.matchCase,
           iconSize: getBooleanFF('platform.editor.a11y-find-replace') ? 'small' : undefined,
           onClick: this.handleMatchCaseClick,
@@ -282,32 +268,28 @@ var Find = /*#__PURE__*/function (_React$Component) {
           css: countStyles
         }, count.total === 0 ? this.noResultsFound : resultsCount)), jsx(FindReplaceTooltipButton, {
           title: this.matchCase,
-          icon: this.matchCaseIcon,
-          newIcon: MatchCaseIcon,
+          icon: MatchCaseIcon,
           iconLabel: this.matchCase,
           iconSize: getBooleanFF('platform.editor.a11y-find-replace') ? 'small' : undefined,
           onClick: this.handleMatchCaseClick,
           isPressed: shouldMatchCase
         }), jsx(FindReplaceTooltipButton, {
           title: this.findNext,
-          icon: this.findNextIcon,
-          newIcon: ChevronDownIcon,
+          icon: ChevronDownIcon,
           iconLabel: this.findNext,
           keymapDescription: 'Enter',
           onClick: this.handleFindNextClick,
           disabled: count.total <= 1
         }), jsx(FindReplaceTooltipButton, {
           title: this.findPrevious,
-          icon: this.findPrevIcon,
-          newIcon: ChevronUpIcon,
+          icon: ChevronUpIcon,
           iconLabel: this.findPrevious,
           keymapDescription: 'Shift Enter',
           onClick: this.handleFindPrevClick,
           disabled: count.total <= 1
         }), jsx(FindReplaceTooltipButton, {
           title: this.closeFindReplaceDialog,
-          icon: this.closeIcon,
-          newIcon: EditorCloseIcon,
+          icon: EditorCloseIcon,
           iconLabel: this.closeFindReplaceDialog,
           keymapDescription: 'Escape',
           onClick: this.clearSearch

package/dist/esm/ui/FindReplaceTooltipButton.js

@@ -12,9 +12,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import { IconButton } from '@atlaskit/button/new';
-import LegacyButton from '@atlaskit/button/standard-button';
 import { findKeymapByDescription, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Tooltip from '@atlaskit/tooltip';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export var FindReplaceTooltipButton = /*#__PURE__*/function (_React$PureComponent) {
@@ -39,7 +37,6 @@ export var FindReplaceTooltipButton = /*#__PURE__*/function (_React$PureComponen
       var _this$props = this.props,
         title = _this$props.title,
         icon = _this$props.icon,
-        newIcon = _this$props.newIcon,
         iconSize = _this$props.iconSize,
         keymapDescription = _this$props.keymapDescription,
         disabled = _this$props.disabled,
@@ -55,28 +52,17 @@ export var FindReplaceTooltipButton = /*#__PURE__*/function (_React$PureComponen
         }),
         hideTooltipOnClick: true,
         position: 'top'
-      }, getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? /*#__PURE__*/React.createElement(IconButton, _extends({
+      }, /*#__PURE__*/React.createElement(IconButton, _extends({
         id: "afterInputSection",
         label: title,
         appearance: appearance,
         testId: title,
         ref: this.buttonRef,
-        icon: newIcon,
+        icon: icon,
         UNSAFE_size: iconSize,
         isDisabled: disabled,
         onClick: this.handleClick,
         isSelected: isPressed
-      }, pressedProps)) : /*#__PURE__*/React.createElement(LegacyButton, _extends({
-        id: "afterInputSection",
-        label: title,
-        appearance: appearance,
-        testId: title,
-        ref: this.buttonRef,
-        iconBefore: icon,
-        isDisabled: disabled,
-        onClick: this.handleClick,
-        isSelected: isPressed,
-        shouldFitContainer: true
       }, pressedProps)));
     }
   }]);

package/dist/esm/ui/Replace.js

@@ -13,7 +13,6 @@ import React, { Fragment } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/new';
-import LegacyButton from '@atlaskit/button/standard-button';
 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';
@@ -23,7 +22,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Inline, xcss } from '@atlaskit/primitives';
 import Textfield from '@atlaskit/textfield';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
-import { nextPreviousItemStyles, orderOneStyles, orderZeroDeprecatedStyles, orderZeroStyles, replaceSectionButtonNewStyles, replaceSectionButtonOldStyles, sectionWrapperJustified, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
+import { nextPreviousItemStyles, orderOneStyles, orderZeroStyles, sectionWrapperJustified, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 var Replace = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Replace, _React$PureComponent);
@@ -151,12 +150,6 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
     _this.replaceAll = formatMessage(messages.replaceAll);
     _this.findNext = formatMessage(messages.findNext);
     _this.findPrevious = formatMessage(messages.findPrevious);
-    _this.findNextIcon = jsx(ChevronDownIcon, {
-      label: _this.findNext
-    });
-    _this.findPrevIcon = jsx(ChevronUpIcon, {
-      label: _this.findPrevious
-    });
     _this.closeFindReplaceDialog = formatMessage(messages.closeFindReplaceDialog);
     return _this;
   }
@@ -214,7 +207,6 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
       var resultsReplace = formatMessage(messages.replaceSuccess, {
         numberOfMatches: replaceCount
       });
-      var replaceSectionButtonStyles = getBooleanFF('platform.editor.a11y-find-replace') ? replaceSectionButtonNewStyles : replaceSectionButtonOldStyles;
       return getBooleanFF('platform.editor.a11y-find-replace') ? jsx(Fragment, null, jsx("div", {
         css: [sectionWrapperStyles, sectionWrapperStylesAlternate]
       }, jsx("div", {
@@ -249,8 +241,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         css: nextPreviousItemStyles
       }, jsx(FindReplaceTooltipButton, {
         title: this.findNext,
-        icon: this.findNextIcon,
-        newIcon: ChevronDownIcon,
+        icon: ChevronDownIcon,
         iconLabel: this.findNext,
         keymapDescription: 'Enter',
         onClick: this.handleFindNextClick,
@@ -259,13 +250,12 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         css: nextPreviousItemStyles
       }, jsx(FindReplaceTooltipButton, {
         title: this.findPrevious,
-        icon: this.findPrevIcon,
-        newIcon: ChevronUpIcon,
+        icon: ChevronUpIcon,
         iconLabel: this.findPrevious,
         keymapDescription: 'Shift Enter',
         onClick: this.handleFindPrevClick,
         disabled: count.total <= 1
-      })), getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? jsx(Inline, {
+      })), jsx(Inline, {
         space: "space.075",
         xcss: xcss({
           // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
@@ -284,27 +274,9 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         id: "replaceAll-button",
         onClick: this.handleReplaceAllClick,
         isDisabled: !canReplace
-      }, this.replaceAll)) : jsx(Fragment, null, jsx(LegacyButton, {
-        css: replaceSectionButtonStyles,
-        testId: this.replace,
-        id: "replace-button",
-        onClick: this.handleReplaceClick,
-        isDisabled: !canReplace
-      }, this.replace), jsx(LegacyButton, {
-        css: replaceSectionButtonStyles,
-        appearance: "primary",
-        testId: this.replaceAll,
-        id: "replaceAll-button",
-        onClick: this.handleReplaceAllClick,
-        isDisabled: !canReplace
       }, this.replaceAll))), jsx("div", {
-        css: getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? orderZeroStyles : orderZeroDeprecatedStyles
-      }, getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? jsx(Button, {
-        appearance: "subtle",
-        testId: this.closeFindReplaceDialog,
-        onClick: this.clearSearch
-      }, this.closeFindReplaceDialog) : jsx(LegacyButton, {
-        css: replaceSectionButtonStyles,
+        css: orderZeroStyles
+      }, jsx(Button, {
         appearance: "subtle",
         testId: this.closeFindReplaceDialog,
         onClick: this.clearSearch
@@ -321,7 +293,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         onKeyDown: this.handleReplaceKeyDown,
         onCompositionStart: this.handleCompositionStart,
         onCompositionEnd: this.handleCompositionEnd
-      }), getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? jsx(Inline, {
+      }), jsx(Inline, {
         space: "space.050"
       }, jsx(Button, {
         testId: this.replace,
@@ -331,16 +303,6 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         testId: this.replaceAll,
         onClick: this.handleReplaceAllClick,
         isDisabled: !canReplace
-      }, this.replaceAll)) : jsx(Fragment, null, jsx(LegacyButton, {
-        css: replaceSectionButtonStyles,
-        testId: this.replace,
-        onClick: this.handleReplaceClick,
-        isDisabled: !canReplace
-      }, this.replace), jsx(LegacyButton, {
-        css: replaceSectionButtonStyles,
-        testId: this.replaceAll,
-        onClick: this.handleReplaceAllClick,
-        isDisabled: !canReplace
       }, this.replaceAll)));
     }
   }]);

package/dist/esm/ui/styles.js

@@ -9,13 +9,6 @@ import { fontSize as getFontSize,
 gridSize as getGridSize } from '@atlaskit/theme/constants';
 var fontSize = getFontSize();
 var gridSize = getGridSize();
-export var replaceSectionButtonNewStyles = css({
-  marginLeft: "var(--ds-space-050, 4px)",
-  marginRight: "var(--ds-space-050, 2px)"
-});
-export var replaceSectionButtonOldStyles = css({
-  marginLeft: "var(--ds-space-050, 4px)"
-});
 export var ruleStyles = css({
   width: '100%',
   border: 'none',
@@ -103,10 +96,6 @@ export var orderZeroStyles = css({
   order: '0',
   marginInline: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-025, 2px)")
 });
-export var orderZeroDeprecatedStyles = css({
-  order: '0',
-  marginInline: 0
-});
 export var orderOneStyles = css({
   order: '1'
 });

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

@@ -2,8 +2,7 @@ import React from 'react';
 import type { IconProps } from '@atlaskit/icon/types';
 interface Props {
     title: string;
-    icon: JSX.Element;
-    newIcon: React.ComponentType<React.PropsWithChildren<IconProps>>;
+    icon: React.ComponentType<React.PropsWithChildren<IconProps>>;
     iconLabel: string;
     iconSize?: 'small' | undefined;
     keymapDescription: string;

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

@@ -1,5 +1,3 @@
-export declare const replaceSectionButtonNewStyles: import("@emotion/react").SerializedStyles;
-export declare const replaceSectionButtonOldStyles: import("@emotion/react").SerializedStyles;
 export declare const ruleStyles: import("@emotion/react").SerializedStyles;
 export declare const wrapperStyles: import("@emotion/react").SerializedStyles;
 export declare const wrapperPaddingStyles: import("@emotion/react").SerializedStyles;
@@ -14,5 +12,4 @@ export declare const countStyles: import("@emotion/react").SerializedStyles;
 export declare const countStylesAlternateStyles: import("@emotion/react").SerializedStyles;
 export declare const countWrapperStyles: import("@emotion/react").SerializedStyles;
 export declare const orderZeroStyles: import("@emotion/react").SerializedStyles;
-export declare const orderZeroDeprecatedStyles: import("@emotion/react").SerializedStyles;
 export declare const orderOneStyles: import("@emotion/react").SerializedStyles;

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

@@ -2,8 +2,7 @@ import React from 'react';
 import type { IconProps } from '@atlaskit/icon/types';
 interface Props {
     title: string;
-    icon: JSX.Element;
-    newIcon: React.ComponentType<React.PropsWithChildren<IconProps>>;
+    icon: React.ComponentType<React.PropsWithChildren<IconProps>>;
     iconLabel: string;
     iconSize?: 'small' | undefined;
     keymapDescription: string;

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

@@ -1,5 +1,3 @@
-export declare const replaceSectionButtonNewStyles: import("@emotion/react").SerializedStyles;
-export declare const replaceSectionButtonOldStyles: import("@emotion/react").SerializedStyles;
 export declare const ruleStyles: import("@emotion/react").SerializedStyles;
 export declare const wrapperStyles: import("@emotion/react").SerializedStyles;
 export declare const wrapperPaddingStyles: import("@emotion/react").SerializedStyles;
@@ -14,5 +12,4 @@ export declare const countStyles: import("@emotion/react").SerializedStyles;
 export declare const countStylesAlternateStyles: import("@emotion/react").SerializedStyles;
 export declare const countWrapperStyles: import("@emotion/react").SerializedStyles;
 export declare const orderZeroStyles: import("@emotion/react").SerializedStyles;
-export declare const orderZeroDeprecatedStyles: import("@emotion/react").SerializedStyles;
 export declare const orderOneStyles: import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-find-replace",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "find replace plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,8 +34,8 @@
     "./styles": "./src/styles.ts"
   },
   "dependencies": {
-    "@atlaskit/button": "^17.16.0",
-    "@atlaskit/editor-common": "^81.0.0",
+    "@atlaskit/button": "^17.17.0",
+    "@atlaskit/editor-common": "^81.1.0",
     "@atlaskit/editor-plugin-analytics": "^1.2.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
     "@atlaskit/editor-shared-styles": "^2.11.0",
@@ -105,9 +105,6 @@
   "platform-feature-flags": {
     "platform.editor.a11y-find-replace": {
       "type": "boolean"
-    },
-    "platform.design-system-team.editor-new-button_jjjdo": {
-      "type": "boolean"
     }
   },
   "stricter": {