@atlaskit/editor-plugin-find-replace 2.0.3 → 2.0.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 2.0.5
+
+### Patch Changes
+
+- [#130689](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130689)
+  [`d8c4b9bdc0075`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d8c4b9bdc0075) -
+  Fixed mount point for find and replace popup
+- Updated dependencies
+
+## 2.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.0.3
 
 ### Patch Changes

package/dist/cjs/findReplacePlugin.js

@@ -8,10 +8,11 @@ exports.findReplacePlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _types = require("@atlaskit/editor-common/types");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _main = require("./pm-plugins/main");
 var _pluginKey = require("./pm-plugins/plugin-key");
-var _FindReplaceToolbarButtonWithState = _interopRequireDefault(require("./ui/FindReplaceToolbarButtonWithState"));
+var _FindReplaceDropDownOrToolbarButtonWithState = _interopRequireDefault(require("./ui/FindReplaceDropDownOrToolbarButtonWithState"));
 var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_ref) {
   var _api$primaryToolbar;
   var props = _ref.config,
@@ -29,7 +30,7 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
     if (props !== null && props !== void 0 && props.twoLineEditorToolbar) {
       return null;
     } else {
-      return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButtonWithState.default, {
+      return /*#__PURE__*/_react.default.createElement(_FindReplaceDropDownOrToolbarButtonWithState.default, {
         popupsBoundariesElement: popupsBoundariesElement,
         popupsMountPoint: popupsMountPoint,
         popupsScrollableElement: popupsScrollableElement,
@@ -79,7 +80,7 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
           containerElement = _ref4.containerElement,
           dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent,
           isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing;
-        return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButtonWithState.default, {
+        return /*#__PURE__*/_react.default.createElement(_FindReplaceDropDownOrToolbarButtonWithState.default, {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsMountPoint: popupsMountPoint,
           popupsScrollableElement: popupsScrollableElement,
@@ -91,6 +92,31 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
         });
       }
     },
-    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
+    contentComponent: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
+      exposure: true
+    }) ? function (_ref5) {
+      var editorView = _ref5.editorView,
+        containerElement = _ref5.containerElement,
+        popupsMountPoint = _ref5.popupsMountPoint,
+        popupsBoundariesElement = _ref5.popupsBoundariesElement,
+        popupsScrollableElement = _ref5.popupsScrollableElement,
+        wrapperElement = _ref5.wrapperElement,
+        dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
+      var popupsMountPointEl = popupsMountPoint || ( // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      wrapperElement === null || wrapperElement === void 0 ? void 0 : wrapperElement.querySelector("[data-editor-container='true']"));
+      return /*#__PURE__*/_react.default.createElement(_FindReplaceDropDownOrToolbarButtonWithState.default, {
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsMountPoint: popupsMountPointEl,
+        popupsScrollableElement: popupsScrollableElement || containerElement || undefined,
+        isToolbarReducedSpacing: false,
+        editorView: editorView,
+        containerElement: containerElement,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
+        api: api,
+        doesNotHaveButton: true
+      });
+    } : undefined
   };
 };

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -16,7 +16,7 @@ var _utils2 = require("./utils");
 var _array = require("./utils/array");
 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; }
-// TODO: move into index export
+// TODO: ED-26959 - move into index export
 
 var handleDocChanged = function handleDocChanged(tr, pluginState) {
   var isActive = pluginState.isActive,

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

@@ -150,7 +150,6 @@ var removeDecorationsFromSet = exports.removeDecorationsFromSet = function remov
   // there is a bug in prosemirror-view where it can't cope with deleting inline
   // decorations from a set in some cases (where there are multiple levels of nested
   // children arrays), and it deletes more decorations than it should
-  // todo: ticket link
   var lostDecorations = findLostAdjacentDecorations(decorationsToRemove, prevDecorations, newDecorations);
   if (lostDecorations.length > 0) {
     decorationSet = decorationSet.add(doc, lostDecorations);

package/dist/cjs/ui/{FindReplaceToolbarButtonWithState.js → FindReplaceDropDownOrToolbarButtonWithState.js}

@@ -11,6 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _commands = require("../pm-plugins/commands");
 var _commandsWithAnalytics = require("../pm-plugins/commands-with-analytics");
+var _FindReplaceDropdown = _interopRequireDefault(require("./FindReplaceDropdown"));
 var _FindReplaceToolbarButton = _interopRequireDefault(require("./FindReplaceToolbarButton"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -50,7 +51,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
     takeFullWidth = _ref2.takeFullWidth,
     api = _ref2.api,
-    isButtonHidden = _ref2.isButtonHidden;
+    isButtonHidden = _ref2.isButtonHidden,
+    doesNotHaveButton = _ref2.doesNotHaveButton;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   var _useSharedPluginState = useSharedPluginStateNoDebounce(api),
     findReplaceState = _useSharedPluginState.findReplaceState;
@@ -138,7 +140,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   if (!findReplaceState) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButton.default, {
+  var DropDownComponent = doesNotHaveButton ? _FindReplaceDropdown.default : _FindReplaceToolbarButton.default;
+  return /*#__PURE__*/_react.default.createElement(DropDownComponent, {
     shouldMatchCase: findReplaceState.shouldMatchCase,
     onToggleMatchCase: handleToggleMatchCase,
     isActive: findReplaceState.isActive,

package/dist/cjs/ui/FindReplaceDropdown.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _primitives = require("@atlaskit/primitives");
+var _FindReplace = _interopRequireDefault(require("./FindReplace"));
+var findReplaceWrapperStyles = (0, _primitives.xcss)({
+  display: 'flex',
+  flexDirection: 'column'
+});
+
+// Magic number taken from ../FindReplaceToolbarButton.tsx
+var dropdownWidthNewDesign = 382;
+var FindReplaceDropdown = function FindReplaceDropdown(props) {
+  var findText = props.findText,
+    replaceText = props.replaceText,
+    isActive = props.isActive,
+    index = props.index,
+    numMatches = props.numMatches,
+    popupsMountPoint = props.popupsMountPoint,
+    onCancel = props.onCancel;
+  if (!popupsMountPoint) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement(_uiMenu.Dropdown, {
+    target: popupsMountPoint,
+    mountTo: popupsMountPoint,
+    forcePlacement: true,
+    alignX: 'right',
+    alignY: 'start',
+    offset: [4, 0],
+    isOpen: isActive,
+    handleEscapeKeydown: function handleEscapeKeydown() {
+      if (isActive) {
+        onCancel({
+          triggerMethod: _analytics.TRIGGER_METHOD.KEYBOARD
+        });
+      }
+    },
+    fitWidth: dropdownWidthNewDesign,
+    zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex,
+    arrowKeyNavigationProviderOptions: {
+      type: _uiMenu.ArrowKeyNavigationType.MENU,
+      disableArrowKeyNavigation: true
+    }
+  }, /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+    xcss: findReplaceWrapperStyles
+  }, /*#__PURE__*/_react.default.createElement(_FindReplace.default, (0, _extends2.default)({
+    findText: findText,
+    replaceText: replaceText,
+    count: {
+      index: index,
+      total: numMatches
+    }
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
+  }, props))));
+};
+var _default = exports.default = (0, _reactIntlNext.injectIntl)(FindReplaceDropdown);

package/dist/cjs/ui/styles.js

@@ -15,8 +15,6 @@ var _colors = require("@atlaskit/theme/colors");
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 /* eslint-disable */
 
-// TODO: https://product-fabric.atlassian.net/browse/DSP-4290
-
 var searchMatchClass = exports.searchMatchClass = 'search-match';
 var selectedSearchMatchClass = exports.selectedSearchMatchClass = 'selected-search-match';
 var findReplaceStyles = exports.findReplaceStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(searchMatchClass), {

package/dist/es2019/findReplacePlugin.js

@@ -1,10 +1,11 @@
 import React from 'react';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import keymapPlugin from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { findReplacePluginKey } from './pm-plugins/plugin-key';
-import FindReplaceToolbarButtonWithState from './ui/FindReplaceToolbarButtonWithState';
+import FindReplaceDropDownOrToolbarButtonWithState from './ui/FindReplaceDropDownOrToolbarButtonWithState';
 export const findReplacePlugin = ({
   config: props,
   api
@@ -24,7 +25,7 @@ export const findReplacePlugin = ({
     if (props !== null && props !== void 0 && props.twoLineEditorToolbar) {
       return null;
     } else {
-      return /*#__PURE__*/React.createElement(FindReplaceToolbarButtonWithState, {
+      return /*#__PURE__*/React.createElement(FindReplaceDropDownOrToolbarButtonWithState, {
         popupsBoundariesElement: popupsBoundariesElement,
         popupsMountPoint: popupsMountPoint,
         popupsScrollableElement: popupsScrollableElement,
@@ -74,7 +75,7 @@ export const findReplacePlugin = ({
         dispatchAnalyticsEvent,
         isToolbarReducedSpacing
       }) => {
-        return /*#__PURE__*/React.createElement(FindReplaceToolbarButtonWithState, {
+        return /*#__PURE__*/React.createElement(FindReplaceDropDownOrToolbarButtonWithState, {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsMountPoint: popupsMountPoint,
           popupsScrollableElement: popupsScrollableElement,
@@ -86,6 +87,32 @@ export const findReplacePlugin = ({
         });
       }
     },
-    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
+    contentComponent: editorExperiment('platform_editor_controls', 'variant1', {
+      exposure: true
+    }) ? ({
+      editorView,
+      containerElement,
+      popupsMountPoint,
+      popupsBoundariesElement,
+      popupsScrollableElement,
+      wrapperElement,
+      dispatchAnalyticsEvent
+    }) => {
+      const popupsMountPointEl = popupsMountPoint || ( // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      wrapperElement === null || wrapperElement === void 0 ? void 0 : wrapperElement.querySelector("[data-editor-container='true']"));
+      return /*#__PURE__*/React.createElement(FindReplaceDropDownOrToolbarButtonWithState, {
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsMountPoint: popupsMountPointEl,
+        popupsScrollableElement: popupsScrollableElement || containerElement || undefined,
+        isToolbarReducedSpacing: false,
+        editorView: editorView,
+        containerElement: containerElement,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
+        api: api,
+        doesNotHaveButton: true
+      });
+    } : undefined
   };
 };

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -4,7 +4,7 @@ import { initialState } from './main';
 import { findReplacePluginKey } from './plugin-key';
 import reducer from './reducer';
 import { createDecorations, findDecorationFromMatch, findMatches, findSearchIndex, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
-import { findUniqueItemsIn } from './utils/array'; // TODO: move into index export
+import { findUniqueItemsIn } from './utils/array'; // TODO: ED-26959 - move into index export
 
 const handleDocChanged = (tr, pluginState) => {
   const {

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

@@ -123,7 +123,6 @@ export const removeDecorationsFromSet = (decorationSet, decorationsToRemove, doc
   // there is a bug in prosemirror-view where it can't cope with deleting inline
   // decorations from a set in some cases (where there are multiple levels of nested
   // children arrays), and it deletes more decorations than it should
-  // todo: ticket link
   const lostDecorations = findLostAdjacentDecorations(decorationsToRemove, prevDecorations, newDecorations);
   if (lostDecorations.length > 0) {
     decorationSet = decorationSet.add(doc, lostDecorations);

package/dist/es2019/ui/{FindReplaceToolbarButtonWithState.js → FindReplaceDropDownOrToolbarButtonWithState.js}

@@ -2,6 +2,7 @@ import React, { useLayoutEffect, useState } from 'react';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 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';
 import FindReplaceToolbarButton from './FindReplaceToolbarButton';
 
 // light implementation of useSharedPluginState(). This is due to findreplace
@@ -37,7 +38,8 @@ const FindReplaceToolbarButtonWithState = ({
   dispatchAnalyticsEvent,
   takeFullWidth,
   api,
-  isButtonHidden
+  isButtonHidden,
+  doesNotHaveButton
 }) => {
   var _api$analytics;
   const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
@@ -123,7 +125,8 @@ const FindReplaceToolbarButtonWithState = ({
   if (!findReplaceState) {
     return null;
   }
-  return /*#__PURE__*/React.createElement(FindReplaceToolbarButton, {
+  const DropDownComponent = doesNotHaveButton ? FindReplaceDropdown : FindReplaceToolbarButton;
+  return /*#__PURE__*/React.createElement(DropDownComponent, {
     shouldMatchCase: findReplaceState.shouldMatchCase,
     onToggleMatchCase: handleToggleMatchCase,
     isActive: findReplaceState.isActive,

package/dist/es2019/ui/FindReplaceDropdown.js

@@ -0,0 +1,63 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { injectIntl } from 'react-intl-next';
+import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
+import { ArrowKeyNavigationType, Dropdown } from '@atlaskit/editor-common/ui-menu';
+import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { Box, xcss } from '@atlaskit/primitives';
+import FindReplace from './FindReplace';
+const findReplaceWrapperStyles = xcss({
+  display: 'flex',
+  flexDirection: 'column'
+});
+
+// Magic number taken from ../FindReplaceToolbarButton.tsx
+const dropdownWidthNewDesign = 382;
+const FindReplaceDropdown = props => {
+  const {
+    findText,
+    replaceText,
+    isActive,
+    index,
+    numMatches,
+    popupsMountPoint,
+    onCancel
+  } = props;
+  if (!popupsMountPoint) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(Dropdown, {
+    target: popupsMountPoint,
+    mountTo: popupsMountPoint,
+    forcePlacement: true,
+    alignX: 'right',
+    alignY: 'start',
+    offset: [4, 0],
+    isOpen: isActive,
+    handleEscapeKeydown: () => {
+      if (isActive) {
+        onCancel({
+          triggerMethod: TRIGGER_METHOD.KEYBOARD
+        });
+      }
+    },
+    fitWidth: dropdownWidthNewDesign,
+    zIndex: akEditorFloatingPanelZIndex,
+    arrowKeyNavigationProviderOptions: {
+      type: ArrowKeyNavigationType.MENU,
+      disableArrowKeyNavigation: true
+    }
+  }, /*#__PURE__*/React.createElement(Box, {
+    xcss: findReplaceWrapperStyles
+  }, /*#__PURE__*/React.createElement(FindReplace, _extends({
+    findText: findText,
+    replaceText: replaceText,
+    count: {
+      index,
+      total: numMatches
+    }
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
+  }, props))));
+};
+export default injectIntl(FindReplaceDropdown);

package/dist/es2019/ui/styles.js

@@ -5,7 +5,6 @@
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 /* eslint-disable */
 
-// TODO: https://product-fabric.atlassian.net/browse/DSP-4290
 import { css } from '@emotion/react';
 import { N40A, N50A, N60A } from '@atlaskit/theme/colors';
 export const searchMatchClass = 'search-match';

package/dist/esm/findReplacePlugin.js

@@ -1,10 +1,11 @@
 import React from 'react';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import keymapPlugin from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { findReplacePluginKey } from './pm-plugins/plugin-key';
-import FindReplaceToolbarButtonWithState from './ui/FindReplaceToolbarButtonWithState';
+import FindReplaceDropDownOrToolbarButtonWithState from './ui/FindReplaceDropDownOrToolbarButtonWithState';
 export var findReplacePlugin = function findReplacePlugin(_ref) {
   var _api$primaryToolbar;
   var props = _ref.config,
@@ -22,7 +23,7 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
     if (props !== null && props !== void 0 && props.twoLineEditorToolbar) {
       return null;
     } else {
-      return /*#__PURE__*/React.createElement(FindReplaceToolbarButtonWithState, {
+      return /*#__PURE__*/React.createElement(FindReplaceDropDownOrToolbarButtonWithState, {
         popupsBoundariesElement: popupsBoundariesElement,
         popupsMountPoint: popupsMountPoint,
         popupsScrollableElement: popupsScrollableElement,
@@ -72,7 +73,7 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
           containerElement = _ref4.containerElement,
           dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent,
           isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing;
-        return /*#__PURE__*/React.createElement(FindReplaceToolbarButtonWithState, {
+        return /*#__PURE__*/React.createElement(FindReplaceDropDownOrToolbarButtonWithState, {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsMountPoint: popupsMountPoint,
           popupsScrollableElement: popupsScrollableElement,
@@ -84,6 +85,31 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
         });
       }
     },
-    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
+    primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
+    contentComponent: editorExperiment('platform_editor_controls', 'variant1', {
+      exposure: true
+    }) ? function (_ref5) {
+      var editorView = _ref5.editorView,
+        containerElement = _ref5.containerElement,
+        popupsMountPoint = _ref5.popupsMountPoint,
+        popupsBoundariesElement = _ref5.popupsBoundariesElement,
+        popupsScrollableElement = _ref5.popupsScrollableElement,
+        wrapperElement = _ref5.wrapperElement,
+        dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
+      var popupsMountPointEl = popupsMountPoint || ( // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      wrapperElement === null || wrapperElement === void 0 ? void 0 : wrapperElement.querySelector("[data-editor-container='true']"));
+      return /*#__PURE__*/React.createElement(FindReplaceDropDownOrToolbarButtonWithState, {
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsMountPoint: popupsMountPointEl,
+        popupsScrollableElement: popupsScrollableElement || containerElement || undefined,
+        isToolbarReducedSpacing: false,
+        editorView: editorView,
+        containerElement: containerElement,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
+        api: api,
+        doesNotHaveButton: true
+      });
+    } : undefined
   };
 };

package/dist/esm/pm-plugins/plugin-factory.js

@@ -8,7 +8,7 @@ import { initialState } from './main';
 import { findReplacePluginKey } from './plugin-key';
 import reducer from './reducer';
 import { createDecorations, findDecorationFromMatch, findMatches, findSearchIndex, isMatchAffectedByStep, removeDecorationsFromSet, removeMatchesFromSet } from './utils';
-import { findUniqueItemsIn } from './utils/array'; // TODO: move into index export
+import { findUniqueItemsIn } from './utils/array'; // TODO: ED-26959 - move into index export
 
 var handleDocChanged = function handleDocChanged(tr, pluginState) {
   var isActive = pluginState.isActive,

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

@@ -140,7 +140,6 @@ export var removeDecorationsFromSet = function removeDecorationsFromSet(decorati
   // there is a bug in prosemirror-view where it can't cope with deleting inline
   // decorations from a set in some cases (where there are multiple levels of nested
   // children arrays), and it deletes more decorations than it should
-  // todo: ticket link
   var lostDecorations = findLostAdjacentDecorations(decorationsToRemove, prevDecorations, newDecorations);
   if (lostDecorations.length > 0) {
     decorationSet = decorationSet.add(doc, lostDecorations);

package/dist/esm/ui/{FindReplaceToolbarButtonWithState.js → FindReplaceDropDownOrToolbarButtonWithState.js}

@@ -3,6 +3,7 @@ import React, { useLayoutEffect, useState } from 'react';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 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';
 import FindReplaceToolbarButton from './FindReplaceToolbarButton';
 
 // light implementation of useSharedPluginState(). This is due to findreplace
@@ -41,7 +42,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
     takeFullWidth = _ref2.takeFullWidth,
     api = _ref2.api,
-    isButtonHidden = _ref2.isButtonHidden;
+    isButtonHidden = _ref2.isButtonHidden,
+    doesNotHaveButton = _ref2.doesNotHaveButton;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   var _useSharedPluginState = useSharedPluginStateNoDebounce(api),
     findReplaceState = _useSharedPluginState.findReplaceState;
@@ -129,7 +131,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   if (!findReplaceState) {
     return null;
   }
-  return /*#__PURE__*/React.createElement(FindReplaceToolbarButton, {
+  var DropDownComponent = doesNotHaveButton ? FindReplaceDropdown : FindReplaceToolbarButton;
+  return /*#__PURE__*/React.createElement(DropDownComponent, {
     shouldMatchCase: findReplaceState.shouldMatchCase,
     onToggleMatchCase: handleToggleMatchCase,
     isActive: findReplaceState.isActive,

package/dist/esm/ui/FindReplaceDropdown.js

@@ -0,0 +1,61 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { injectIntl } from 'react-intl-next';
+import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
+import { ArrowKeyNavigationType, Dropdown } from '@atlaskit/editor-common/ui-menu';
+import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { Box, xcss } from '@atlaskit/primitives';
+import FindReplace from './FindReplace';
+var findReplaceWrapperStyles = xcss({
+  display: 'flex',
+  flexDirection: 'column'
+});
+
+// Magic number taken from ../FindReplaceToolbarButton.tsx
+var dropdownWidthNewDesign = 382;
+var FindReplaceDropdown = function FindReplaceDropdown(props) {
+  var findText = props.findText,
+    replaceText = props.replaceText,
+    isActive = props.isActive,
+    index = props.index,
+    numMatches = props.numMatches,
+    popupsMountPoint = props.popupsMountPoint,
+    onCancel = props.onCancel;
+  if (!popupsMountPoint) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(Dropdown, {
+    target: popupsMountPoint,
+    mountTo: popupsMountPoint,
+    forcePlacement: true,
+    alignX: 'right',
+    alignY: 'start',
+    offset: [4, 0],
+    isOpen: isActive,
+    handleEscapeKeydown: function handleEscapeKeydown() {
+      if (isActive) {
+        onCancel({
+          triggerMethod: TRIGGER_METHOD.KEYBOARD
+        });
+      }
+    },
+    fitWidth: dropdownWidthNewDesign,
+    zIndex: akEditorFloatingPanelZIndex,
+    arrowKeyNavigationProviderOptions: {
+      type: ArrowKeyNavigationType.MENU,
+      disableArrowKeyNavigation: true
+    }
+  }, /*#__PURE__*/React.createElement(Box, {
+    xcss: findReplaceWrapperStyles
+  }, /*#__PURE__*/React.createElement(FindReplace, _extends({
+    findText: findText,
+    replaceText: replaceText,
+    count: {
+      index: index,
+      total: numMatches
+    }
+    // Ignored via go/ees005
+    // eslint-disable-next-line react/jsx-props-no-spreading
+  }, props))));
+};
+export default injectIntl(FindReplaceDropdown);

package/dist/esm/ui/styles.js

@@ -6,7 +6,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 /* eslint-disable */
 
-// TODO: https://product-fabric.atlassian.net/browse/DSP-4290
 import { css } from '@emotion/react';
 import { N40A, N50A, N60A } from '@atlaskit/theme/colors';
 export var searchMatchClass = 'search-match';

package/dist/types/types/index.d.ts

@@ -34,6 +34,7 @@ export type FindReplaceToolbarButtonWithStateProps = {
     takeFullWidth?: boolean;
     api: ExtractInjectionAPI<FindReplacePlugin> | undefined;
     isButtonHidden?: boolean;
+    doesNotHaveButton?: boolean;
 };
 export type FindReplaceToolbarButtonActionProps = Omit<FindReplaceToolbarButtonWithStateProps, 'api'>;
 export type Match = {

package/dist/{types-ts4.5/ui/FindReplaceToolbarButtonWithState.d.ts → types/ui/FindReplaceDropDownOrToolbarButtonWithState.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, takeFullWidth, api, isButtonHidden, }: FindReplaceToolbarButtonWithStateProps) => React.JSX.Element | null>;
+declare const _default: React.MemoExoticComponent<({ popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, isToolbarReducedSpacing, editorView, containerElement, dispatchAnalyticsEvent, takeFullWidth, api, isButtonHidden, doesNotHaveButton, }: FindReplaceToolbarButtonWithStateProps) => React.JSX.Element | null>;
 export default _default;

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

@@ -0,0 +1,15 @@
+import React from 'react';
+import { type WrappedComponentProps } from 'react-intl-next';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import type { FindReplaceProps } from './FindReplace';
+export interface FindReplaceDropdownProps extends Omit<FindReplaceProps, 'count'> {
+    index: number;
+    numMatches: number;
+    isActive: boolean;
+    popupsMountPoint?: HTMLElement;
+    dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
+}
+declare const _default: React.FC<import("react-intl-next").WithIntlProps<FindReplaceDropdownProps & WrappedComponentProps>> & {
+    WrappedComponent: React.ComponentType<FindReplaceDropdownProps & WrappedComponentProps>;
+};
+export default _default;

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

@@ -34,6 +34,7 @@ export type FindReplaceToolbarButtonWithStateProps = {
     takeFullWidth?: boolean;
     api: ExtractInjectionAPI<FindReplacePlugin> | undefined;
     isButtonHidden?: boolean;
+    doesNotHaveButton?: boolean;
 };
 export type FindReplaceToolbarButtonActionProps = Omit<FindReplaceToolbarButtonWithStateProps, 'api'>;
 export type Match = {

package/dist/{types/ui/FindReplaceToolbarButtonWithState.d.ts → types-ts4.5/ui/FindReplaceDropDownOrToolbarButtonWithState.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, takeFullWidth, api, isButtonHidden, }: FindReplaceToolbarButtonWithStateProps) => React.JSX.Element | null>;
+declare const _default: React.MemoExoticComponent<({ popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, isToolbarReducedSpacing, editorView, containerElement, dispatchAnalyticsEvent, takeFullWidth, api, isButtonHidden, doesNotHaveButton, }: FindReplaceToolbarButtonWithStateProps) => React.JSX.Element | null>;
 export default _default;

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

@@ -0,0 +1,15 @@
+import React from 'react';
+import { type WrappedComponentProps } from 'react-intl-next';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import type { FindReplaceProps } from './FindReplace';
+export interface FindReplaceDropdownProps extends Omit<FindReplaceProps, 'count'> {
+    index: number;
+    numMatches: number;
+    isActive: boolean;
+    popupsMountPoint?: HTMLElement;
+    dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
+}
+declare const _default: React.FC<import("react-intl-next").WithIntlProps<FindReplaceDropdownProps & WrappedComponentProps>> & {
+    WrappedComponent: React.ComponentType<FindReplaceDropdownProps & WrappedComponentProps>;
+};
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-find-replace",
-	"version": "2.0.3",
+	"version": "2.0.5",
 	"description": "find replace plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,18 +33,19 @@
 	},
 	"dependencies": {
 		"@atlaskit/button": "^21.1.0",
-		"@atlaskit/editor-common": "^102.0.0",
-		"@atlaskit/editor-plugin-analytics": "^2.1.0",
-		"@atlaskit/editor-plugin-primary-toolbar": "^3.0.0",
+		"@atlaskit/editor-common": "^102.13.0",
+		"@atlaskit/editor-plugin-analytics": "^2.2.0",
+		"@atlaskit/editor-plugin-primary-toolbar": "^3.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/form": "^12.0.0",
-		"@atlaskit/icon": "^24.1.0",
+		"@atlaskit/icon": "^25.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.1.0",
+		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tokens": "^4.3.0",
+		"@atlaskit/tmp-editor-statsig": "^4.2.0",
+		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",