@atlaskit/editor-plugin-find-replace 1.0.2 → 1.1.1

package/.eslintrc.js

@@ -2,6 +2,10 @@ module.exports = {
   rules: {
     '@typescript-eslint/no-duplicate-imports': 'error',
     '@typescript-eslint/no-explicit-any': 'error',
+    '@atlaskit/design-system/ensure-design-token-usage/preview': [
+      'error',
+      { domains: ['spacing'], shouldEnforceFallbacks: false },
+    ],
     '@typescript-eslint/ban-types': [
       'error',
       {

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 1.1.1
+
+### Patch Changes
+
+- [#73177](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/73177) [`22452599ed8f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/22452599ed8f) - Move styling for certain packages to tokens.
+
+## 1.1.0
+
+### Minor Changes
+
+- [#72122](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/72122) [`c3186450404a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c3186450404a) - Breaking change:
+
+  ## WHAT?:
+
+  Removing feature flags:
+
+  - singleLayout
+  - newInsertionBehaviour
+  - interactiveExpand
+  - findReplace
+  - findReplaceMatchCase
+  - extendFloatingToolbar
+
+  ## WHY?:
+
+  Because the flags and props are unused/by default active. Removing them will reduce our maintenance burden
+
+  ## HOW to update your code:
+
+  - If you were using the feature flag - the behaviour is now default and you can remove the flags
+  - If you were not using the feature flag - the behaviour is now default.
+  - If you have opted out of using the feature flag - we have been careful to ensure no-one has opted out of the behaviours. If you do have an issue please reach out to #help-editor.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/cjs/FindReplaceToolbarButtonWithState.js

@@ -48,7 +48,6 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     editorView = _ref2.editorView,
     containerElement = _ref2.containerElement,
     dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
-    featureFlags = _ref2.featureFlags,
     takeFullWidth = _ref2.takeFullWidth,
     api = _ref2.api;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
@@ -135,12 +134,10 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleToggleMatchCase = function handleToggleMatchCase() {
     dispatchCommand((0, _commands.toggleMatchCase)());
   };
-  var findReplaceMatchCase = featureFlags.findReplaceMatchCase;
   if (!findReplaceState) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButton.default, {
-    allowMatchCase: findReplaceMatchCase,
     shouldMatchCase: findReplaceState.shouldMatchCase,
     onToggleMatchCase: handleToggleMatchCase,
     isActive: findReplaceState.isActive,

package/dist/cjs/plugin.js

@@ -11,10 +11,8 @@ var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _main = require("./pm-plugins/main");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_ref) {
-  var _api$featureFlags;
   var props = _ref.config,
     api = _ref.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'findReplace',
     pmPlugins: function pmPlugins() {
@@ -53,12 +51,7 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
           popupsScrollableElement: popupsScrollableElement,
           editorView: editorView,
           containerElement: containerElement,
-          dispatchAnalyticsEvent: dispatchAnalyticsEvent
-          // `allowMatchCase` comes through the preset, but not the feature flags
-          // prop with the `ComposableEditor` - grab the FFs from the editor API
-          // instead until we clean this up.
-          ,
-          featureFlags: featureFlags,
+          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           isToolbarReducedSpacing: isToolbarReducedSpacing,
           api: api
         });
@@ -84,7 +77,6 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
           containerElement: containerElement,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
-          featureFlags: featureFlags,
           api: api
         });
       }

package/dist/cjs/ui/Find.js

@@ -135,7 +135,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleMatchCaseClick", function (buttonRef) {
-      if (_this.props.allowMatchCase && _this.props.onToggleMatchCase) {
+      if (_this.props.onToggleMatchCase) {
         _this.props.onToggleMatchCase();
         _this.props.onFind(_this.props.findText);
       }
@@ -216,7 +216,6 @@ var Find = /*#__PURE__*/function (_React$Component) {
       var _this$props = this.props,
         findText = _this$props.findText,
         count = _this$props.count,
-        allowMatchCase = _this$props.allowMatchCase,
         shouldMatchCase = _this$props.shouldMatchCase,
         formatMessage = _this$props.intl.formatMessage;
       var resultsCount = formatMessage(_messages.findReplaceMessages.resultsCount, {
@@ -231,7 +230,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
         }, findText && (0, _react2.jsx)("span", {
           "data-testid": "textfield-count",
           css: [_styles.countStyles, _styles.countStylesAlternateStyles]
-        }, count.total === 0 ? this.noResultsFound : resultsCount)), allowMatchCase && (0, _react2.jsx)("div", {
+        }, count.total === 0 ? this.noResultsFound : resultsCount)), (0, _react2.jsx)("div", {
           css: _styles.matchCaseSection
         }, (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
           title: this.matchCase,
@@ -286,7 +285,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
         }, findText && (0, _react2.jsx)("span", {
           "data-testid": "textfield-count",
           css: _styles.countStyles
-        }, count.total === 0 ? this.noResultsFound : resultsCount)), allowMatchCase && (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
+        }, count.total === 0 ? this.noResultsFound : resultsCount)), (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
           title: this.matchCase,
           icon: this.matchCaseIcon,
           newIcon: _keyboard.default,

package/dist/cjs/ui/Replace.js

@@ -253,7 +253,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
       }, (0, _react2.jsx)("div", {
         css: _styles.orderOneStyles
       }, (0, _react2.jsx)("div", {
-        css: _styles.NextPreviousItem
+        css: _styles.nextPreviousItemStyles
       }, (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
         title: this.findNext,
         icon: this.findNextIcon,
@@ -263,7 +263,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         onClick: this.handleFindNextClick,
         disabled: count.total <= 1
       })), (0, _react2.jsx)("div", {
-        css: _styles.NextPreviousItem
+        css: _styles.nextPreviousItemStyles
       }, (0, _react2.jsx)(_FindReplaceTooltipButton.FindReplaceTooltipButton, {
         title: this.findPrevious,
         icon: this.findPrevIcon,
@@ -275,7 +275,9 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
       })), (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.editor-new-button_jjjdo') ? (0, _react2.jsx)(_primitives.Inline, {
         space: "space.075",
         xcss: (0, _primitives.xcss)({
+          // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
           paddingInlineStart: 'space.050',
+          // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
           paddingInlineEnd: 'space.025'
         })
       }, (0, _react2.jsx)(_new.default, {
@@ -303,7 +305,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         onClick: this.handleReplaceAllClick,
         isDisabled: !canReplace
       }, this.replaceAll))), (0, _react2.jsx)("div", {
-        css: _styles.orderZeroStyles
+        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,

package/dist/cjs/ui/styles.js

@@ -4,14 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wrapperStyles = exports.wrapperPaddingStyles = exports.textFieldWrapper = exports.sectionWrapperStylesAlternate = exports.sectionWrapperStyles = exports.sectionWrapperJustified = exports.ruleStyles = exports.replaceSectionButtonStyles = exports.orderZeroStyles = exports.orderOneStyles = exports.matchCaseSection = exports.countWrapperStyles = exports.countStylesAlternateStyles = exports.countStyles = exports.afterInputSection = exports.NextPreviousItem = void 0;
+exports.wrapperStyles = exports.wrapperPaddingStyles = exports.textFieldWrapper = exports.sectionWrapperStylesAlternate = exports.sectionWrapperStyles = exports.sectionWrapperJustified = exports.ruleStyles = exports.replaceSectionButtonStyles = exports.orderZeroStyles = exports.orderZeroDeprecatedStyles = exports.orderOneStyles = exports.nextPreviousItemStyles = exports.matchCaseSection = exports.countWrapperStyles = exports.countStylesAlternateStyles = exports.countStyles = exports.afterInputSection = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _constants = require("@atlaskit/theme/constants");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 /* eslint-disable @atlaskit/design-system/no-nested-styles */
 /* eslint-disable @repo/internal/styles/no-exported-styles */
 /** @jsx jsx */
@@ -47,7 +47,9 @@ var sectionWrapperJustified = exports.sectionWrapperJustified = (0, _react.css)(
 var textFieldWrapper = exports.textFieldWrapper = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  flex: 1 100%;\n  flex-wrap: wrap;\n\n  #find-text-field,\n  #replace-text-field {\n    height: ", "em;\n  }\n\n  label {\n    font-size: ", ";\n    line-height: ", "px;\n  }\n"])), gridSize * 4.5 / fontSize, (0, _editorSharedStyles.relativeFontSizeToBase16)(14), gridSize * 2);
 var afterInputSection = exports.afterInputSection = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex: 0 0 auto;\n  align-items: center;\n"])));
 var matchCaseSection = exports.matchCaseSection = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  padding-right: ", ";\n\n  button {\n    width: 20px;\n    height: 20px;\n  }\n"])), "var(--ds-space-100, 8px)");
-var NextPreviousItem = exports.NextPreviousItem = (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  padding: 0px 3px;\n"])));
+var nextPreviousItemStyles = exports.nextPreviousItemStyles = (0, _react.css)({
+  padding: "0px ".concat("var(--ds-space-025, 2px)")
+});
 var countStyles = exports.countStyles = (0, _react.css)({
   color: "var(--ds-text-subtlest, #626F86)",
   fontSize: "".concat((0, _editorSharedStyles.relativeFontSizeToBase16)(12)),
@@ -66,7 +68,11 @@ var countWrapperStyles = exports.countWrapperStyles = (0, _react.css)({
 });
 var orderZeroStyles = exports.orderZeroStyles = (0, _react.css)({
   order: '0',
-  marginInline: (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.editor-new-button_jjjdo') ? "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-025, 2px)") : 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/FindReplaceToolbarButtonWithState.js

@@ -35,7 +35,6 @@ const FindReplaceToolbarButtonWithState = ({
   editorView,
   containerElement,
   dispatchAnalyticsEvent,
-  featureFlags,
   takeFullWidth,
   api
 }) => {
@@ -120,14 +119,10 @@ const FindReplaceToolbarButtonWithState = ({
   const handleToggleMatchCase = () => {
     dispatchCommand(toggleMatchCase());
   };
-  const {
-    findReplaceMatchCase
-  } = featureFlags;
   if (!findReplaceState) {
     return null;
   }
   return /*#__PURE__*/React.createElement(FindReplaceToolbarButton, {
-    allowMatchCase: findReplaceMatchCase,
     shouldMatchCase: findReplaceState.shouldMatchCase,
     onToggleMatchCase: handleToggleMatchCase,
     isActive: findReplaceState.isActive,

package/dist/es2019/plugin.js

@@ -7,8 +7,6 @@ export const findReplacePlugin = ({
   config: props,
   api
 }) => {
-  var _api$featureFlags;
-  const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'findReplace',
     pmPlugins() {
@@ -47,12 +45,7 @@ export const findReplacePlugin = ({
           popupsScrollableElement: popupsScrollableElement,
           editorView: editorView,
           containerElement: containerElement,
-          dispatchAnalyticsEvent: dispatchAnalyticsEvent
-          // `allowMatchCase` comes through the preset, but not the feature flags
-          // prop with the `ComposableEditor` - grab the FFs from the editor API
-          // instead until we clean this up.
-          ,
-          featureFlags: featureFlags,
+          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           isToolbarReducedSpacing: isToolbarReducedSpacing,
           api: api
         });
@@ -79,7 +72,6 @@ export const findReplacePlugin = ({
           containerElement: containerElement,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
-          featureFlags: featureFlags,
           api: api
         });
       }

package/dist/es2019/ui/Find.js

@@ -118,7 +118,7 @@ class Find extends React.Component {
       });
     });
     _defineProperty(this, "handleMatchCaseClick", buttonRef => {
-      if (this.props.allowMatchCase && this.props.onToggleMatchCase) {
+      if (this.props.onToggleMatchCase) {
         this.props.onToggleMatchCase();
         this.props.onFind(this.props.findText);
       }
@@ -192,7 +192,6 @@ class Find extends React.Component {
     const {
       findText,
       count,
-      allowMatchCase,
       shouldMatchCase,
       intl: {
         formatMessage
@@ -210,7 +209,7 @@ class Find extends React.Component {
       }, findText && jsx("span", {
         "data-testid": "textfield-count",
         css: [countStyles, countStylesAlternateStyles]
-      }, count.total === 0 ? this.noResultsFound : resultsCount)), allowMatchCase && jsx("div", {
+      }, count.total === 0 ? this.noResultsFound : resultsCount)), jsx("div", {
         css: matchCaseSection
       }, jsx(FindReplaceTooltipButton, {
         title: this.matchCase,
@@ -265,7 +264,7 @@ class Find extends React.Component {
       }, findText && jsx("span", {
         "data-testid": "textfield-count",
         css: countStyles
-      }, count.total === 0 ? this.noResultsFound : resultsCount)), allowMatchCase && jsx(FindReplaceTooltipButton, {
+      }, count.total === 0 ? this.noResultsFound : resultsCount)), jsx(FindReplaceTooltipButton, {
         title: this.matchCase,
         icon: this.matchCaseIcon,
         newIcon: MatchCaseIcon,

package/dist/es2019/ui/Replace.js

@@ -15,7 +15,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Inline, xcss } from '@atlaskit/primitives';
 import Textfield from '@atlaskit/textfield';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
-import { NextPreviousItem, orderOneStyles, orderZeroStyles, replaceSectionButtonStyles, sectionWrapperJustified, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
+import { nextPreviousItemStyles, orderOneStyles, orderZeroDeprecatedStyles, orderZeroStyles, replaceSectionButtonStyles, sectionWrapperJustified, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 class Replace extends React.PureComponent {
   constructor(props) {
@@ -229,7 +229,7 @@ class Replace extends React.PureComponent {
     }, jsx("div", {
       css: orderOneStyles
     }, jsx("div", {
-      css: NextPreviousItem
+      css: nextPreviousItemStyles
     }, jsx(FindReplaceTooltipButton, {
       title: this.findNext,
       icon: this.findNextIcon,
@@ -239,7 +239,7 @@ class Replace extends React.PureComponent {
       onClick: this.handleFindNextClick,
       disabled: count.total <= 1
     })), jsx("div", {
-      css: NextPreviousItem
+      css: nextPreviousItemStyles
     }, jsx(FindReplaceTooltipButton, {
       title: this.findPrevious,
       icon: this.findPrevIcon,
@@ -251,7 +251,9 @@ class Replace extends React.PureComponent {
     })), getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? jsx(Inline, {
       space: "space.075",
       xcss: xcss({
+        // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
         paddingInlineStart: 'space.050',
+        // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
         paddingInlineEnd: 'space.025'
       })
     }, jsx(Button, {
@@ -279,7 +281,7 @@ class Replace extends React.PureComponent {
       onClick: this.handleReplaceAllClick,
       isDisabled: !canReplace
     }, this.replaceAll))), jsx("div", {
-      css: orderZeroStyles
+      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,

package/dist/es2019/ui/styles.js

@@ -87,9 +87,9 @@ export const matchCaseSection = css`
     height: 20px;
   }
 `;
-export const NextPreviousItem = css`
-  padding: 0px 3px;
-`;
+export const nextPreviousItemStyles = css({
+  padding: `0px ${"var(--ds-space-025, 2px)"}`
+});
 export const countStyles = css({
   color: `${"var(--ds-text-subtlest, #626F86)"}`,
   fontSize: `${relativeFontSizeToBase16(12)}`,
@@ -108,7 +108,11 @@ export const countWrapperStyles = css({
 });
 export const orderZeroStyles = css({
   order: '0',
-  marginInline: getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-025, 2px)"}` : 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/FindReplaceToolbarButtonWithState.js

@@ -39,7 +39,6 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     editorView = _ref2.editorView,
     containerElement = _ref2.containerElement,
     dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
-    featureFlags = _ref2.featureFlags,
     takeFullWidth = _ref2.takeFullWidth,
     api = _ref2.api;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
@@ -126,12 +125,10 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleToggleMatchCase = function handleToggleMatchCase() {
     dispatchCommand(toggleMatchCase());
   };
-  var findReplaceMatchCase = featureFlags.findReplaceMatchCase;
   if (!findReplaceState) {
     return null;
   }
   return /*#__PURE__*/React.createElement(FindReplaceToolbarButton, {
-    allowMatchCase: findReplaceMatchCase,
     shouldMatchCase: findReplaceState.shouldMatchCase,
     onToggleMatchCase: handleToggleMatchCase,
     isActive: findReplaceState.isActive,

package/dist/esm/plugin.js

@@ -4,10 +4,8 @@ import keymapPlugin from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { findReplacePluginKey } from './pm-plugins/plugin-key';
 export var findReplacePlugin = function findReplacePlugin(_ref) {
-  var _api$featureFlags;
   var props = _ref.config,
     api = _ref.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'findReplace',
     pmPlugins: function pmPlugins() {
@@ -46,12 +44,7 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
           popupsScrollableElement: popupsScrollableElement,
           editorView: editorView,
           containerElement: containerElement,
-          dispatchAnalyticsEvent: dispatchAnalyticsEvent
-          // `allowMatchCase` comes through the preset, but not the feature flags
-          // prop with the `ComposableEditor` - grab the FFs from the editor API
-          // instead until we clean this up.
-          ,
-          featureFlags: featureFlags,
+          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           isToolbarReducedSpacing: isToolbarReducedSpacing,
           api: api
         });
@@ -77,7 +70,6 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
           containerElement: containerElement,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
-          featureFlags: featureFlags,
           api: api
         });
       }

package/dist/esm/ui/Find.js

@@ -130,7 +130,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_assertThisInitialized(_this), "handleMatchCaseClick", function (buttonRef) {
-      if (_this.props.allowMatchCase && _this.props.onToggleMatchCase) {
+      if (_this.props.onToggleMatchCase) {
         _this.props.onToggleMatchCase();
         _this.props.onFind(_this.props.findText);
       }
@@ -211,7 +211,6 @@ var Find = /*#__PURE__*/function (_React$Component) {
       var _this$props = this.props,
         findText = _this$props.findText,
         count = _this$props.count,
-        allowMatchCase = _this$props.allowMatchCase,
         shouldMatchCase = _this$props.shouldMatchCase,
         formatMessage = _this$props.intl.formatMessage;
       var resultsCount = formatMessage(messages.resultsCount, {
@@ -226,7 +225,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
         }, findText && jsx("span", {
           "data-testid": "textfield-count",
           css: [countStyles, countStylesAlternateStyles]
-        }, count.total === 0 ? this.noResultsFound : resultsCount)), allowMatchCase && jsx("div", {
+        }, count.total === 0 ? this.noResultsFound : resultsCount)), jsx("div", {
           css: matchCaseSection
         }, jsx(FindReplaceTooltipButton, {
           title: this.matchCase,
@@ -281,7 +280,7 @@ var Find = /*#__PURE__*/function (_React$Component) {
         }, findText && jsx("span", {
           "data-testid": "textfield-count",
           css: countStyles
-        }, count.total === 0 ? this.noResultsFound : resultsCount)), allowMatchCase && jsx(FindReplaceTooltipButton, {
+        }, count.total === 0 ? this.noResultsFound : resultsCount)), jsx(FindReplaceTooltipButton, {
           title: this.matchCase,
           icon: this.matchCaseIcon,
           newIcon: MatchCaseIcon,

package/dist/esm/ui/Replace.js

@@ -23,7 +23,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Inline, xcss } from '@atlaskit/primitives';
 import Textfield from '@atlaskit/textfield';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
-import { NextPreviousItem, orderOneStyles, orderZeroStyles, replaceSectionButtonStyles, sectionWrapperJustified, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
+import { nextPreviousItemStyles, orderOneStyles, orderZeroDeprecatedStyles, orderZeroStyles, replaceSectionButtonStyles, 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);
@@ -245,7 +245,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
       }, jsx("div", {
         css: orderOneStyles
       }, jsx("div", {
-        css: NextPreviousItem
+        css: nextPreviousItemStyles
       }, jsx(FindReplaceTooltipButton, {
         title: this.findNext,
         icon: this.findNextIcon,
@@ -255,7 +255,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         onClick: this.handleFindNextClick,
         disabled: count.total <= 1
       })), jsx("div", {
-        css: NextPreviousItem
+        css: nextPreviousItemStyles
       }, jsx(FindReplaceTooltipButton, {
         title: this.findPrevious,
         icon: this.findPrevIcon,
@@ -267,7 +267,9 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
       })), getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? jsx(Inline, {
         space: "space.075",
         xcss: xcss({
+          // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
           paddingInlineStart: 'space.050',
+          // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
           paddingInlineEnd: 'space.025'
         })
       }, jsx(Button, {
@@ -295,7 +297,7 @@ var Replace = /*#__PURE__*/function (_React$PureComponent) {
         onClick: this.handleReplaceAllClick,
         isDisabled: !canReplace
       }, this.replaceAll))), jsx("div", {
-        css: orderZeroStyles
+        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,

package/dist/esm/ui/styles.js

@@ -1,5 +1,5 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 /* eslint-disable @atlaskit/design-system/no-nested-styles */
 /* eslint-disable @repo/internal/styles/no-exported-styles */
 /** @jsx jsx */
@@ -42,7 +42,9 @@ export var sectionWrapperJustified = css(_templateObject3 || (_templateObject3 =
 export var textFieldWrapper = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  flex: 1 100%;\n  flex-wrap: wrap;\n\n  #find-text-field,\n  #replace-text-field {\n    height: ", "em;\n  }\n\n  label {\n    font-size: ", ";\n    line-height: ", "px;\n  }\n"])), gridSize * 4.5 / fontSize, relativeFontSizeToBase16(14), gridSize * 2);
 export var afterInputSection = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  display: flex;\n  flex: 0 0 auto;\n  align-items: center;\n"])));
 export var matchCaseSection = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  padding-right: ", ";\n\n  button {\n    width: 20px;\n    height: 20px;\n  }\n"])), "var(--ds-space-100, 8px)");
-export var NextPreviousItem = css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  padding: 0px 3px;\n"])));
+export var nextPreviousItemStyles = css({
+  padding: "0px ".concat("var(--ds-space-025, 2px)")
+});
 export var countStyles = css({
   color: "var(--ds-text-subtlest, #626F86)",
   fontSize: "".concat(relativeFontSizeToBase16(12)),
@@ -61,7 +63,11 @@ export var countWrapperStyles = css({
 });
 export var orderZeroStyles = css({
   order: '0',
-  marginInline: getBooleanFF('platform.design-system-team.editor-new-button_jjjdo') ? "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-025, 2px)") : 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/FindReplaceToolbarButtonWithState.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { FindReplaceToolbarButtonWithStateProps } from './types';
-declare const _default: React.MemoExoticComponent<({ popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, isToolbarReducedSpacing, editorView, containerElement, dispatchAnalyticsEvent, featureFlags, takeFullWidth, api, }: FindReplaceToolbarButtonWithStateProps) => JSX.Element | null>;
+declare const _default: React.MemoExoticComponent<({ popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, isToolbarReducedSpacing, editorView, containerElement, dispatchAnalyticsEvent, takeFullWidth, api, }: FindReplaceToolbarButtonWithStateProps) => JSX.Element | null>;
 export default _default;

package/dist/types/types.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="react" />
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import type { ExtractInjectionAPI, FeatureFlags, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { DecorationSet, EditorView } from '@atlaskit/editor-prosemirror/view';
 export interface FindReplacePluginState {
     /** Whether find/replace is active, i.e. displayed */
@@ -34,10 +33,9 @@ export type FindReplaceToolbarButtonWithStateProps = {
     containerElement: HTMLElement | null;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
     takeFullWidth?: boolean;
-    featureFlags: FeatureFlags;
     api: ExtractInjectionAPI<FindReplacePlugin> | undefined;
 };
-export type FindReplaceToolbarButtonActionProps = Omit<FindReplaceToolbarButtonWithStateProps, 'featureFlags' | 'api'>;
+export type FindReplaceToolbarButtonActionProps = Omit<FindReplaceToolbarButtonWithStateProps, 'api'>;
 type Config = {
     takeFullWidth: boolean;
     twoLineEditorToolbar: boolean;
@@ -45,10 +43,7 @@ type Config = {
 export type FindReplacePlugin = NextEditorPlugin<'findReplace', {
     pluginConfiguration: Config;
     sharedState: FindReplacePluginState | undefined;
-    dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<AnalyticsPlugin>
-    ];
+    dependencies: [OptionalPlugin<AnalyticsPlugin>];
     actions: {
         getToolbarButton: (params: FindReplaceToolbarButtonActionProps) => React.ReactNode;
     };

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

@@ -8,9 +8,10 @@ export declare const sectionWrapperJustified: import("@emotion/react").Serialize
 export declare const textFieldWrapper: import("@emotion/react").SerializedStyles;
 export declare const afterInputSection: import("@emotion/react").SerializedStyles;
 export declare const matchCaseSection: import("@emotion/react").SerializedStyles;
-export declare const NextPreviousItem: import("@emotion/react").SerializedStyles;
+export declare const nextPreviousItemStyles: import("@emotion/react").SerializedStyles;
 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/FindReplaceToolbarButtonWithState.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { FindReplaceToolbarButtonWithStateProps } from './types';
-declare const _default: React.MemoExoticComponent<({ popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, isToolbarReducedSpacing, editorView, containerElement, dispatchAnalyticsEvent, featureFlags, takeFullWidth, api, }: FindReplaceToolbarButtonWithStateProps) => JSX.Element | null>;
+declare const _default: React.MemoExoticComponent<({ popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, isToolbarReducedSpacing, editorView, containerElement, dispatchAnalyticsEvent, takeFullWidth, api, }: FindReplaceToolbarButtonWithStateProps) => JSX.Element | null>;
 export default _default;

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

@@ -1,8 +1,7 @@
 /// <reference types="react" />
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import type { ExtractInjectionAPI, FeatureFlags, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { DecorationSet, EditorView } from '@atlaskit/editor-prosemirror/view';
 export interface FindReplacePluginState {
     /** Whether find/replace is active, i.e. displayed */
@@ -34,10 +33,9 @@ export type FindReplaceToolbarButtonWithStateProps = {
     containerElement: HTMLElement | null;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
     takeFullWidth?: boolean;
-    featureFlags: FeatureFlags;
     api: ExtractInjectionAPI<FindReplacePlugin> | undefined;
 };
-export type FindReplaceToolbarButtonActionProps = Omit<FindReplaceToolbarButtonWithStateProps, 'featureFlags' | 'api'>;
+export type FindReplaceToolbarButtonActionProps = Omit<FindReplaceToolbarButtonWithStateProps, 'api'>;
 type Config = {
     takeFullWidth: boolean;
     twoLineEditorToolbar: boolean;
@@ -46,7 +44,6 @@ export type FindReplacePlugin = NextEditorPlugin<'findReplace', {
     pluginConfiguration: Config;
     sharedState: FindReplacePluginState | undefined;
     dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
         OptionalPlugin<AnalyticsPlugin>
     ];
     actions: {

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

@@ -8,9 +8,10 @@ export declare const sectionWrapperJustified: import("@emotion/react").Serialize
 export declare const textFieldWrapper: import("@emotion/react").SerializedStyles;
 export declare const afterInputSection: import("@emotion/react").SerializedStyles;
 export declare const matchCaseSection: import("@emotion/react").SerializedStyles;
-export declare const NextPreviousItem: import("@emotion/react").SerializedStyles;
+export declare const nextPreviousItemStyles: import("@emotion/react").SerializedStyles;
 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.0.2",
+  "version": "1.1.1",
   "description": "find replace plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,10 +34,9 @@
     "./styles": "./src/styles.ts"
   },
   "dependencies": {
-    "@atlaskit/button": "^17.3.0",
-    "@atlaskit/editor-common": "^77.4.0",
+    "@atlaskit/button": "^17.4.0",
+    "@atlaskit/editor-common": "^78.0.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
-    "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/form": "^9.0.5",