@atlaskit/editor-core 191.0.1 → 191.0.4

package/dist/cjs/plugins/find-replace/FindReplaceToolbarButtonWithState.js

@@ -1,28 +1,57 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _types = require("./types");
-var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
 var _commandsWithAnalytics = require("./commands-with-analytics");
 var _commands = require("./commands");
 var _FindReplaceToolbarButton = _interopRequireDefault(require("./ui/FindReplaceToolbarButton"));
 var _analytics = require("@atlaskit/editor-common/analytics");
-var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(_ref) {
-  var popupsBoundariesElement = _ref.popupsBoundariesElement,
-    popupsMountPoint = _ref.popupsMountPoint,
-    popupsScrollableElement = _ref.popupsScrollableElement,
-    isToolbarReducedSpacing = _ref.isToolbarReducedSpacing,
-    editorView = _ref.editorView,
-    containerElement = _ref.containerElement,
-    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
-    featureFlags = _ref.featureFlags,
-    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
-    takeFullWidth = _ref.takeFullWidth;
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+// light implementation of useSharedPluginState(). This is due to findreplace
+// being the only plugin that previously used WithPluginState with
+// debounce=false. That was implemented because of text sync issues
+// between editor & findreplace dialog.
+// To address under ENGHEALTH-5853
+var useSharedPluginStateNoDebounce = function useSharedPluginStateNoDebounce(api) {
+  var _useState = (0, _react.useState)(api === null || api === void 0 ? void 0 : api.findReplace.sharedState.currentState()),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  (0, _react.useLayoutEffect)(function () {
+    var unsub = api === null || api === void 0 ? void 0 : api.findReplace.sharedState.onChange(function (_ref) {
+      var nextSharedState = _ref.nextSharedState;
+      setState(nextSharedState);
+    });
+    return function () {
+      unsub === null || unsub === void 0 || unsub();
+    };
+  }, [api]);
+  return {
+    findReplaceState: state
+  };
+};
+var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(_ref2) {
+  var _api$analytics;
+  var popupsBoundariesElement = _ref2.popupsBoundariesElement,
+    popupsMountPoint = _ref2.popupsMountPoint,
+    popupsScrollableElement = _ref2.popupsScrollableElement,
+    isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
+    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;
+  var _useSharedPluginState = useSharedPluginStateNoDebounce(api),
+    findReplaceState = _useSharedPluginState.findReplaceState;
   if (!editorView) {
     return null;
   }
@@ -57,25 +86,25 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
       }));
     });
   };
-  var handleFindNext = function handleFindNext(_ref2) {
-    var triggerMethod = _ref2.triggerMethod;
+  var handleFindNext = function handleFindNext(_ref3) {
+    var triggerMethod = _ref3.triggerMethod;
     runWithEditorFocused(function () {
       return dispatchCommand((0, _commandsWithAnalytics.findNextWithAnalytics)(editorAnalyticsAPI)({
         triggerMethod: triggerMethod
       }));
     });
   };
-  var handleFindPrev = function handleFindPrev(_ref3) {
-    var triggerMethod = _ref3.triggerMethod;
+  var handleFindPrev = function handleFindPrev(_ref4) {
+    var triggerMethod = _ref4.triggerMethod;
     runWithEditorFocused(function () {
       return dispatchCommand((0, _commandsWithAnalytics.findPrevWithAnalytics)(editorAnalyticsAPI)({
         triggerMethod: triggerMethod
       }));
     });
   };
-  var handleReplace = function handleReplace(_ref4) {
-    var triggerMethod = _ref4.triggerMethod,
-      replaceText = _ref4.replaceText;
+  var handleReplace = function handleReplace(_ref5) {
+    var triggerMethod = _ref5.triggerMethod,
+      replaceText = _ref5.replaceText;
     runWithEditorFocused(function () {
       return dispatchCommand((0, _commandsWithAnalytics.replaceWithAnalytics)(editorAnalyticsAPI)({
         triggerMethod: triggerMethod,
@@ -83,8 +112,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
       }));
     });
   };
-  var handleReplaceAll = function handleReplaceAll(_ref5) {
-    var replaceText = _ref5.replaceText;
+  var handleReplaceAll = function handleReplaceAll(_ref6) {
+    var replaceText = _ref6.replaceText;
     runWithEditorFocused(function () {
       return dispatchCommand((0, _commandsWithAnalytics.replaceAllWithAnalytics)(editorAnalyticsAPI)({
         replaceText: replaceText
@@ -94,8 +123,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleFindBlur = function handleFindBlur() {
     dispatchCommand((0, _commands.blur)());
   };
-  var handleCancel = function handleCancel(_ref6) {
-    var triggerMethod = _ref6.triggerMethod;
+  var handleCancel = function handleCancel(_ref7) {
+    var triggerMethod = _ref7.triggerMethod;
     dispatchCommand((0, _commandsWithAnalytics.cancelSearchWithAnalytics)(editorAnalyticsAPI)({
       triggerMethod: triggerMethod
     }));
@@ -105,42 +134,33 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     dispatchCommand((0, _commands.toggleMatchCase)());
   };
   var findReplaceMatchCase = featureFlags.findReplaceMatchCase;
-  return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
-    debounce: false,
-    plugins: {
-      findReplaceState: _types.findReplacePluginKey
-    },
-    render: function render(_ref7) {
-      var findReplaceState = _ref7.findReplaceState;
-      if (!findReplaceState) {
-        return null;
-      }
-      return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButton.default, {
-        allowMatchCase: findReplaceMatchCase,
-        shouldMatchCase: findReplaceState.shouldMatchCase,
-        onToggleMatchCase: handleToggleMatchCase,
-        isActive: findReplaceState.isActive,
-        findText: findReplaceState.findText,
-        index: findReplaceState.index,
-        numMatches: findReplaceState.matches.length,
-        replaceText: findReplaceState.replaceText,
-        shouldFocus: findReplaceState.shouldFocus,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsMountPoint: popupsMountPoint,
-        popupsScrollableElement: popupsScrollableElement,
-        isReducedSpacing: !!isToolbarReducedSpacing,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        onFindBlur: handleFindBlur,
-        onCancel: handleCancel,
-        onActivate: handleActivate,
-        onFind: handleFind,
-        onFindNext: handleFindNext,
-        onFindPrev: handleFindPrev,
-        onReplace: handleReplace,
-        onReplaceAll: handleReplaceAll,
-        takeFullWidth: !!takeFullWidth
-      });
-    }
+  if (!findReplaceState) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButton.default, {
+    allowMatchCase: findReplaceMatchCase,
+    shouldMatchCase: findReplaceState.shouldMatchCase,
+    onToggleMatchCase: handleToggleMatchCase,
+    isActive: findReplaceState.isActive,
+    findText: findReplaceState.findText,
+    index: findReplaceState.index,
+    numMatches: findReplaceState.matches.length,
+    replaceText: findReplaceState.replaceText,
+    shouldFocus: findReplaceState.shouldFocus,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsMountPoint: popupsMountPoint,
+    popupsScrollableElement: popupsScrollableElement,
+    isReducedSpacing: !!isToolbarReducedSpacing,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    onFindBlur: handleFindBlur,
+    onCancel: handleCancel,
+    onActivate: handleActivate,
+    onFind: handleFind,
+    onFindNext: handleFindNext,
+    onFindPrev: handleFindPrev,
+    onReplace: handleReplace,
+    onReplaceAll: handleReplaceAll,
+    takeFullWidth: !!takeFullWidth
   });
 };
-var _default = exports.default = FindReplaceToolbarButtonWithState;
+var _default = exports.default = /*#__PURE__*/_react.default.memo(FindReplaceToolbarButtonWithState);

package/dist/cjs/plugins/find-replace/commands.js

@@ -10,7 +10,7 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _plugin = require("./plugin");
 var _actions = require("./actions");
 var _utils = require("./utils");
-var _commands = require("../../utils/commands");
+var _commands = require("./utils/commands");
 var _batchDecorations = _interopRequireDefault(require("./utils/batch-decorations"));
 var activate = exports.activate = function activate() {
   return (0, _plugin.createCommand)(function (state) {

package/dist/cjs/plugins/find-replace/index.js

@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _plugin = require("./plugin");
 var _keymap = _interopRequireDefault(require("./keymap"));
 var _FindReplaceToolbarButtonWithState = _interopRequireDefault(require("./FindReplaceToolbarButtonWithState"));
+var _pluginKey = require("./plugin-key");
 var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_ref) {
   var _api$featureFlags;
   var props = _ref.config,
@@ -31,18 +32,49 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
         }
       }];
     },
-    primaryToolbarComponent: function primaryToolbarComponent(_ref3) {
-      var popupsBoundariesElement = _ref3.popupsBoundariesElement,
-        popupsMountPoint = _ref3.popupsMountPoint,
-        popupsScrollableElement = _ref3.popupsScrollableElement,
-        isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing,
-        editorView = _ref3.editorView,
-        containerElement = _ref3.containerElement,
-        dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      return _pluginKey.findReplacePluginKey.getState(editorState) || undefined;
+    },
+    actions: {
+      getToolbar: function getToolbar(_ref3) {
+        var popupsBoundariesElement = _ref3.popupsBoundariesElement,
+          popupsMountPoint = _ref3.popupsMountPoint,
+          popupsScrollableElement = _ref3.popupsScrollableElement,
+          editorView = _ref3.editorView,
+          containerElement = _ref3.containerElement,
+          dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent,
+          isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing;
+        return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButtonWithState.default, {
+          popupsBoundariesElement: popupsBoundariesElement,
+          popupsMountPoint: popupsMountPoint,
+          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,
+          isToolbarReducedSpacing: isToolbarReducedSpacing,
+          api: api
+        });
+      }
+    },
+    primaryToolbarComponent: function primaryToolbarComponent(_ref4) {
+      var popupsBoundariesElement = _ref4.popupsBoundariesElement,
+        popupsMountPoint = _ref4.popupsMountPoint,
+        popupsScrollableElement = _ref4.popupsScrollableElement,
+        isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing,
+        editorView = _ref4.editorView,
+        containerElement = _ref4.containerElement,
+        dispatchAnalyticsEvent = _ref4.dispatchAnalyticsEvent;
       if (props !== null && props !== void 0 && props.twoLineEditorToolbar) {
         return null;
       } else {
-        var _api$analytics2;
         return /*#__PURE__*/_react.default.createElement(_FindReplaceToolbarButtonWithState.default, {
           popupsBoundariesElement: popupsBoundariesElement,
           popupsMountPoint: popupsMountPoint,
@@ -53,7 +85,7 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           takeFullWidth: props === null || props === void 0 ? void 0 : props.takeFullWidth,
           featureFlags: featureFlags,
-          editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
+          api: api
         });
       }
     }

package/dist/cjs/plugins/find-replace/keymap.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _keymaps = require("../../keymaps");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _commandsWithAnalytics = require("./commands-with-analytics");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var activateFindReplace = function activateFindReplace(editorAnalyticsAPI) {

package/dist/cjs/plugins/{extension → find-replace}/plugin-key.js

@@ -3,6 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pluginKey = void 0;
+exports.findReplacePluginKey = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
-var pluginKey = exports.pluginKey = new _state.PluginKey('extensionPlugin');
+var findReplacePluginKey = exports.findReplacePluginKey = new _state.PluginKey('findReplace');

package/dist/cjs/plugins/find-replace/plugin.js

@@ -9,12 +9,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _pluginStateFactory = require("../../utils/plugin-state-factory");
+var _utils = require("@atlaskit/editor-common/utils");
 var _reducer = _interopRequireDefault(require("./reducer"));
-var _types = require("./types");
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 var _array = require("../../utils/array");
-var _utils2 = require("@atlaskit/editor-common/utils");
+var _pluginKey = require("./plugin-key");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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; }
 var initialState = exports.initialState = {
@@ -33,14 +32,14 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
   if (!isActive || !findText) {
     return pluginState;
   }
-  if (!tr.steps.find(_utils2.stepHasSlice)) {
+  if (!tr.steps.find(_utils.stepHasSlice)) {
     return pluginState;
   }
   var index = pluginState.index,
     decorationSet = pluginState.decorationSet,
     matches = pluginState.matches,
     shouldMatchCase = pluginState.shouldMatchCase;
-  var newMatches = (0, _utils.findMatches)(tr.doc, findText, shouldMatchCase);
+  var newMatches = (0, _utils2.findMatches)(tr.doc, findText, shouldMatchCase);
   decorationSet = decorationSet.map(tr.mapping, tr.doc);
   var numDecorations = decorationSet.find().length;
   var mappedMatches = matches.map(function (match) {
@@ -59,17 +58,17 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     // go through tr steps and find any new matches from user adding content or
     // any dead matches from user deleting content
     tr.steps.forEach(function (step) {
-      if ((0, _utils2.stepHasSlice)(step)) {
+      if ((0, _utils.stepHasSlice)(step)) {
         // add all matches that are between the affected positions and don't already have
         // corresponding decorations
         matchesToAdd = [].concat((0, _toConsumableArray2.default)(matchesToAdd), (0, _toConsumableArray2.default)(newMatches.filter(function (match) {
-          return (0, _utils.isMatchAffectedByStep)(match, step, tr) && !(0, _utils.findDecorationFromMatch)(decorationSet, match);
+          return (0, _utils2.isMatchAffectedByStep)(match, step, tr) && !(0, _utils2.findDecorationFromMatch)(decorationSet, match);
         })));
 
         // delete any matches that are missing from the newMatches array and have a
         // corresponding decoration
         matchesToDelete = [].concat((0, _toConsumableArray2.default)(matchesToDelete), (0, _toConsumableArray2.default)((0, _array.findUniqueItemsIn)(mappedMatches.filter(function (match) {
-          return (0, _utils.isMatchAffectedByStep)(match, step, tr) && !!(0, _utils.findDecorationFromMatch)(decorationSet, match);
+          return (0, _utils2.isMatchAffectedByStep)(match, step, tr) && !!(0, _utils2.findDecorationFromMatch)(decorationSet, match);
         }), newMatches, function (firstMatch, secondMatch) {
           return firstMatch.start === secondMatch.start && firstMatch.end === secondMatch.end;
         })));
@@ -82,10 +81,10 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     var decorationsToDelete = matchesToDelete.reduce(function (decorations, match) {
       return [].concat((0, _toConsumableArray2.default)(decorations), (0, _toConsumableArray2.default)(decorationSet.find(match.start, match.end)));
     }, []);
-    decorationSet = (0, _utils.removeDecorationsFromSet)(decorationSet, decorationsToDelete, tr.doc);
+    decorationSet = (0, _utils2.removeDecorationsFromSet)(decorationSet, decorationsToDelete, tr.doc);
   }
   if (matchesToAdd.length > 0) {
-    decorationSet = decorationSet.add(tr.doc, (0, _utils.createDecorations)(tr.selection.from, matchesToAdd));
+    decorationSet = decorationSet.add(tr.doc, (0, _utils2.createDecorations)(tr.selection.from, matchesToAdd));
   }
 
   // update selected match if it has changed
@@ -97,12 +96,12 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     });
   }
   if (newIndex === undefined || newIndex === -1) {
-    newIndex = (0, _utils.findSearchIndex)(tr.selection.from, newMatches);
+    newIndex = (0, _utils2.findSearchIndex)(tr.selection.from, newMatches);
   }
   var newSelectedMatch = newMatches[newIndex];
-  decorationSet = (0, _utils.removeMatchesFromSet)(decorationSet, [selectedMatch, newSelectedMatch], tr.doc);
+  decorationSet = (0, _utils2.removeMatchesFromSet)(decorationSet, [selectedMatch, newSelectedMatch], tr.doc);
   if (newSelectedMatch) {
-    decorationSet = decorationSet.add(tr.doc, (0, _utils.createDecorations)(0, [newSelectedMatch]));
+    decorationSet = decorationSet.add(tr.doc, (0, _utils2.createDecorations)(0, [newSelectedMatch]));
   }
   return _objectSpread(_objectSpread({}, pluginState), {}, {
     matches: newMatches,
@@ -110,7 +109,7 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     decorationSet: decorationSet
   });
 };
-var _pluginFactory = (0, _pluginStateFactory.pluginFactory)(_types.findReplacePluginKey, (0, _reducer.default)(function () {
+var _pluginFactory = (0, _utils.pluginFactory)(_pluginKey.findReplacePluginKey, (0, _reducer.default)(function () {
     return initialState;
   }), {
     onDocChanged: handleDocChanged
@@ -120,7 +119,7 @@ var _pluginFactory = (0, _pluginStateFactory.pluginFactory)(_types.findReplacePl
   createPluginState = exports.createPluginState = _pluginFactory.createPluginState;
 var createPlugin = exports.createPlugin = function createPlugin(dispatch) {
   return new _safePlugin.SafePlugin({
-    key: _types.findReplacePluginKey,
+    key: _pluginKey.findReplacePluginKey,
     state: createPluginState(dispatch, function () {
       return initialState;
     }),

package/dist/cjs/plugins/find-replace/types.js

@@ -2,7 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-exports.findReplacePluginKey = void 0;
-var _state = require("@atlaskit/editor-prosemirror/state");
-var findReplacePluginKey = exports.findReplacePluginKey = new _state.PluginKey('findReplace');
+});

package/dist/cjs/plugins/find-replace/ui/FindReplaceToolbarButton.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -19,7 +18,6 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _ToolbarButton = _interopRequireWildcard(require("../../../ui/ToolbarButton"));
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _search = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/search"));
 var _FindReplace = _interopRequireDefault(require("./FindReplace"));
@@ -28,8 +26,6 @@ var _keymaps = require("../../../keymaps");
 var _keymaps2 = require("@atlaskit/editor-common/keymaps");
 var _templateObject, _templateObject2, _templateObject3;
 /** @jsx jsx */
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var toolbarButtonWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex: 1 1 auto;\n  flex-grow: 0;\n  justify-content: flex-end;\n  align-items: center;\n  padding: 0 ", ";\n  @media (max-width: ", "px) {\n    justify-content: center;\n    padding: 0;\n  }\n"])), "var(--ds-space-100, 8px)", _editorSharedStyles.akEditorMobileMaxWidth);
@@ -102,8 +98,8 @@ var FindReplaceToolbarButton = /*#__PURE__*/function (_React$PureComponent) {
           type: _uiMenu.ArrowKeyNavigationType.MENU,
           disableArrowKeyNavigation: true
         },
-        trigger: (0, _react2.jsx)(_ToolbarButton.default, {
-          buttonId: _ToolbarButton.TOOLBAR_BUTTON.FIND_REPLACE,
+        trigger: (0, _react2.jsx)(_uiMenu.ToolbarButton, {
+          buttonId: _uiMenu.TOOLBAR_BUTTON.FIND_REPLACE,
           spacing: isReducedSpacing ? 'none' : 'default',
           selected: isActive,
           title: (0, _react2.jsx)(_keymaps.ToolTipContent, {

package/dist/cjs/plugins/find-replace/ui/FindReplaceTooltipButton.js

@@ -15,7 +15,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
-var _keymaps = require("../../../keymaps");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 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; }

package/dist/cjs/plugins/find-replace/utils/commands.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.withScrollIntoView = void 0;
+var withScrollIntoView = exports.withScrollIntoView = function withScrollIntoView(command) {
+  return function (state, dispatch, view) {
+    return command(state, function (tr) {
+      tr.scrollIntoView();
+      if (dispatch) {
+        dispatch(tr);
+      }
+    }, view);
+  };
+};

package/dist/cjs/plugins/index.js

@@ -10,18 +10,6 @@ Object.defineProperty(exports, "avatarGroupPlugin", {
     return _avatarGroup.default;
   }
 });
-Object.defineProperty(exports, "beforePrimaryToolbarPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _beforePrimaryToolbar.default;
-  }
-});
-Object.defineProperty(exports, "extensionPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _extension.default;
-  }
-});
 Object.defineProperty(exports, "findReplacePlugin", {
   enumerable: true,
   get: function get() {
@@ -34,8 +22,6 @@ Object.defineProperty(exports, "jiraIssuePlugin", {
     return _jiraIssue.default;
   }
 });
-var _extension = _interopRequireDefault(require("./extension"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _findReplace = _interopRequireDefault(require("./find-replace"));
-var _avatarGroup = _interopRequireDefault(require("./avatar-group"));
-var _beforePrimaryToolbar = _interopRequireDefault(require("./before-primaryToolbar"));
+var _avatarGroup = _interopRequireDefault(require("./avatar-group"));

package/dist/cjs/presets/universal.js

@@ -50,6 +50,8 @@ var _editorPluginAnnotation = require("@atlaskit/editor-plugin-annotation");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorPluginCollabEdit = require("@atlaskit/editor-plugin-collab-edit");
 var _plugins = require("../plugins");
+var _editorPluginExtension = require("@atlaskit/editor-plugin-extension");
+var _editorPluginBeforePrimaryToolbar = require("@atlaskit/editor-plugin-before-primary-toolbar");
 var _editorPluginFeedbackDialog = require("@atlaskit/editor-plugin-feedback-dialog");
 var _utils = require("@atlaskit/editor-common/utils");
 var _isFullPage = require("../utils/is-full-page");
@@ -69,6 +71,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @returns a full featured preset configured according to the provided props - basis for create-plugins-list
  */
 function createUniversalPreset(appearance, props, featureFlags, prevAppearance, createAnalyticsEvent) {
+  var _featureFlags$lpLinkP;
   var isMobile = appearance === 'mobile';
   var isComment = appearance === 'comment';
   var isChromeless = appearance === 'chromeless';
@@ -77,7 +80,10 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     return featureFlags;
   };
   var defaultPreset = (0, _default.createDefaultPreset)(_objectSpread(_objectSpread({}, props), {}, {
-    createAnalyticsEvent: createAnalyticsEvent
+    createAnalyticsEvent: createAnalyticsEvent,
+    hyperlinkOptions: _objectSpread({
+      lpLinkPicker: (_featureFlags$lpLinkP = featureFlags.lpLinkPicker) !== null && _featureFlags$lpLinkP !== void 0 ? _featureFlags$lpLinkP : false
+    }, props.hyperlinkOptions)
   }));
   var statusMenuDisabled = !props.allowStatus ? true : (0, _typeof2.default)(props.allowStatus) === 'object' ? Boolean(props.allowStatus.menuDisabled) : false;
   var hasBeforePrimaryToolbar = function hasBeforePrimaryToolbar(components) {
@@ -277,7 +283,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add(_editorPluginContextPanel.contextPanelPlugin);
     }
     return builder;
-  }).maybeAdd(_plugins.extensionPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginExtension.extensionPlugin, function (plugin, builder) {
     if (props.allowExtension) {
       var extensionConfig = (0, _typeof2.default)(props.allowExtension) === 'object' ? props.allowExtension : {};
       return builder.add([plugin, {
@@ -321,12 +327,13 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
   }).maybeAdd(_editorPluginCard.cardPlugin, function (plugin, builder) {
     var _props$linking;
     if ((_props$linking = props.linking) !== null && _props$linking !== void 0 && _props$linking.smartLinks || props.smartLinks || props.UNSAFE_cards) {
-      var _props$linking2, _props$linking3;
+      var _props$linking2, _props$linking3, _featureFlags$lpLinkP2;
       var fullWidthMode = appearance === 'full-width';
       return builder.add([plugin, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, props.UNSAFE_cards), props.smartLinks), (_props$linking2 = props.linking) === null || _props$linking2 === void 0 ? void 0 : _props$linking2.smartLinks), {}, {
         platform: isMobile ? 'mobile' : 'web',
         fullWidthMode: fullWidthMode,
         linkPicker: (_props$linking3 = props.linking) === null || _props$linking3 === void 0 ? void 0 : _props$linking3.linkPicker,
+        lpLinkPicker: (_featureFlags$lpLinkP2 = featureFlags.lpLinkPicker) !== null && _featureFlags$lpLinkP2 !== void 0 ? _featureFlags$lpLinkP2 : false,
         editorAppearance: appearance
       })]);
     }
@@ -371,7 +378,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     nativeStatusSupported: !statusMenuDisabled,
     showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
     replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
-  }]).maybeAdd(_plugins.beforePrimaryToolbarPlugin, function (plugin, builder) {
+  }]).maybeAdd(_editorPluginBeforePrimaryToolbar.beforePrimaryToolbarPlugin, function (plugin, builder) {
     if (hasBeforePrimaryToolbar(props.primaryToolbarComponents) && !featureFlags.twoLineEditorToolbar) {
       return builder.add([plugin, {
         beforePrimaryToolbarComponents: props.primaryToolbarComponents.before

package/dist/cjs/ui/Appearance/FullPage/BeforeWrapper.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BeforePrimaryToolbarWrapper = void 0;
+var _react = require("@emotion/react");
+/** @jsx jsx */
+
+var beforePrimaryToolbarPluginWrapperStyles = (0, _react.css)({
+  display: 'flex',
+  marginRight: "var(--ds-space-100, 8px)",
+  flexGrow: 1,
+  justifyContent: 'flex-end',
+  alignItems: 'center'
+});
+// Duplicate of the wrapper from `editor-plugin-before-primary-toolbar` used
+// only in `FullPageToolbar` to decouple the plugin from the main toolbar
+var BeforePrimaryToolbarWrapper = exports.BeforePrimaryToolbarWrapper = function BeforePrimaryToolbarWrapper(props) {
+  return (0, _react.jsx)("div", {
+    css: beforePrimaryToolbarPluginWrapperStyles,
+    "data-testid": 'before-primary-toolbar-components-plugin'
+  }, props.beforePrimaryToolbarComponents);
+};