@atlaskit/editor-core 181.0.1 → 182.0.0

package/dist/esm/plugins/extension/pm-plugins/main.js

@@ -1,81 +1,14 @@
-import _typeof from "@babel/runtime/helpers/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { getExtensionModuleNode } from '@atlaskit/editor-common/extensions';
 import { createSelectionClickHandler } from '../../selection/utils';
 import ExtensionNodeView from '../nodeviews/extension';
 import { updateState, clearEditingContext } from '../commands';
 import { getSelectedExtension, getSelectedDomElement } from '../utils';
 import { createPluginState, getPluginState, createCommand } from '../plugin-factory';
 import { pluginKey } from '../plugin-key';
-var maybeGetUpdateMethodFromExtensionProvider = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(view, extensionProvider) {
-    var nodeWithPos, _nodeWithPos$node$att, extensionType, extensionKey, extensionModuleNode, newNodeWithPos;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            nodeWithPos = getSelectedExtension(view.state, true);
-            if (nodeWithPos) {
-              _context.next = 3;
-              break;
-            }
-            throw new Error('There is no selection');
-          case 3:
-            _nodeWithPos$node$att = nodeWithPos.node.attrs, extensionType = _nodeWithPos$node$att.extensionType, extensionKey = _nodeWithPos$node$att.extensionKey;
-            _context.next = 6;
-            return getExtensionModuleNode(extensionProvider, extensionType, extensionKey);
-          case 6:
-            extensionModuleNode = _context.sent;
-            newNodeWithPos = getSelectedExtension(view.state, true);
-            if (!(newNodeWithPos && newNodeWithPos.node.attrs.extensionType === extensionType && newNodeWithPos.node.attrs.extensionKey === extensionKey && newNodeWithPos.pos === nodeWithPos.pos && extensionModuleNode)) {
-              _context.next = 10;
-              break;
-            }
-            return _context.abrupt("return", extensionModuleNode.update);
-          case 10:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return function maybeGetUpdateMethodFromExtensionProvider(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
-export var updateEditButton = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(view, extensionProvider) {
-    var updateMethod;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
-            return maybeGetUpdateMethodFromExtensionProvider(view, extensionProvider);
-          case 3:
-            updateMethod = _context2.sent;
-            updateState({
-              showEditButton: !!updateMethod,
-              updateExtension: updateMethod && Promise.resolve(updateMethod) || undefined
-            })(view.state, view.dispatch);
-            return _context2.abrupt("return", updateMethod);
-          case 8:
-            _context2.prev = 8;
-            _context2.t0 = _context2["catch"](0);
-          case 10:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2, null, [[0, 8]]);
-  }));
-  return function updateEditButton(_x3, _x4) {
-    return _ref2.apply(this, arguments);
-  };
-}();
+import { updateEditButton } from './utils';
 var shouldShowEditButton = function shouldShowEditButton(extensionHandler, extensionProvider) {
   var usesLegacyMacroBrowser = !extensionHandler && !extensionProvider || typeof extensionHandler === 'function';
   var usesModernUpdateMethod = _typeof(extensionHandler) === 'object' && typeof extensionHandler.update === 'function';
@@ -85,127 +18,188 @@ var shouldShowEditButton = function shouldShowEditButton(extensionHandler, exten
   return false;
 };
 var getUpdateExtensionPromise = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(view, extensionHandler, extensionProvider) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(view, extensionHandler, extensionProvider) {
     var updateMethod;
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context.prev = _context.next) {
           case 0:
             if (!(extensionHandler && _typeof(extensionHandler) === 'object')) {
-              _context3.next = 4;
+              _context.next = 4;
               break;
             }
-            return _context3.abrupt("return", extensionHandler.update);
+            return _context.abrupt("return", extensionHandler.update);
           case 4:
             if (!extensionProvider) {
-              _context3.next = 10;
+              _context.next = 10;
               break;
             }
-            _context3.next = 7;
+            _context.next = 7;
             return updateEditButton(view, extensionProvider);
           case 7:
-            updateMethod = _context3.sent;
+            updateMethod = _context.sent;
             if (!updateMethod) {
-              _context3.next = 10;
+              _context.next = 10;
               break;
             }
-            return _context3.abrupt("return", updateMethod);
+            return _context.abrupt("return", updateMethod);
           case 10:
             throw new Error('No update method available');
           case 11:
           case "end":
-            return _context3.stop();
+            return _context.stop();
         }
       }
-    }, _callee3);
+    }, _callee);
   }));
-  return function getUpdateExtensionPromise(_x5, _x6, _x7) {
-    return _ref3.apply(this, arguments);
+  return function getUpdateExtensionPromise(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
   };
 }();
 export var createExtensionProviderHandler = function createExtensionProviderHandler(view) {
   return /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(name, provider) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(name, provider) {
       var extensionProvider;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               if (!(name === 'extensionProvider' && provider)) {
-                _context4.next = 13;
+                _context2.next = 13;
                 break;
               }
-              _context4.prev = 1;
-              _context4.next = 4;
+              _context2.prev = 1;
+              _context2.next = 4;
               return provider;
             case 4:
-              extensionProvider = _context4.sent;
+              extensionProvider = _context2.sent;
               updateState({
                 extensionProvider: extensionProvider
               })(view.state, view.dispatch);
-              _context4.next = 8;
+              _context2.next = 8;
               return updateEditButton(view, extensionProvider);
             case 8:
-              _context4.next = 13;
+              _context2.next = 13;
               break;
             case 10:
-              _context4.prev = 10;
-              _context4.t0 = _context4["catch"](1);
+              _context2.prev = 10;
+              _context2.t0 = _context2["catch"](1);
               updateState({
                 extensionProvider: undefined
               })(view.state, view.dispatch);
             case 13:
             case "end":
-              return _context4.stop();
+              return _context2.stop();
           }
         }
-      }, _callee4, null, [[1, 10]]);
+      }, _callee2, null, [[1, 10]]);
     }));
-    return function (_x8, _x9) {
-      return _ref4.apply(this, arguments);
+    return function (_x4, _x5) {
+      return _ref2.apply(this, arguments);
     };
   }();
 };
 export var createContextIdentifierProviderHandler = function createContextIdentifierProviderHandler(view) {
   return /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(name, provider) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(name, provider) {
       var contextIdentifierProvider;
-      return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (!(name === 'contextIdentifierProvider' && provider)) {
-                _context5.next = 11;
+                _context3.next = 11;
                 break;
               }
-              _context5.prev = 1;
-              _context5.next = 4;
+              _context3.prev = 1;
+              _context3.next = 4;
               return provider;
             case 4:
-              contextIdentifierProvider = _context5.sent;
+              contextIdentifierProvider = _context3.sent;
               updateState({
                 contextIdentifierProvider: contextIdentifierProvider
               })(view.state, view.dispatch);
-              _context5.next = 11;
+              _context3.next = 11;
               break;
             case 8:
-              _context5.prev = 8;
-              _context5.t0 = _context5["catch"](1);
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](1);
               updateState({
                 contextIdentifierProvider: undefined
               })(view.state, view.dispatch);
             case 11:
             case "end":
-              return _context5.stop();
+              return _context3.stop();
           }
         }
-      }, _callee5, null, [[1, 8]]);
+      }, _callee3, null, [[1, 8]]);
     }));
-    return function (_x10, _x11) {
-      return _ref5.apply(this, arguments);
+    return function (_x6, _x7) {
+      return _ref3.apply(this, arguments);
     };
   }();
 };
+export var handleUpdate = function handleUpdate(_ref4) {
+  var view = _ref4.view,
+    prevState = _ref4.prevState,
+    domAtPos = _ref4.domAtPos,
+    extensionHandlers = _ref4.extensionHandlers;
+  var state = view.state,
+    dispatch = view.dispatch;
+  var _getPluginState = getPluginState(state),
+    element = _getPluginState.element,
+    localId = _getPluginState.localId,
+    extensionProvider = _getPluginState.extensionProvider,
+    showContextPanel = _getPluginState.showContextPanel,
+    showEditButton = _getPluginState.showEditButton;
+
+  // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
+  var selectedExtension = getSelectedExtension(state, true);
+  if (!selectedExtension) {
+    if (showContextPanel) {
+      clearEditingContext(state, dispatch);
+    }
+    return;
+  }
+  var node = selectedExtension.node;
+  var newElement = getSelectedDomElement(state.schema, domAtPos, selectedExtension);
+
+  // In some cases, showEditButton can be stale and the edit button doesn't show - @see ED-15285
+  // To be safe, we update the showEditButton state here
+  var shouldUpdateEditButton = !showEditButton && extensionProvider && element === newElement && !getSelectedExtension(prevState, true);
+  var isNewNodeSelected = node.attrs.localId ? localId !== node.attrs.localId :
+  // This is the current assumption and it's wrong but we are keeping it
+  // as fallback in case we need to turn off `allowLocalIdGeneration`
+  element !== newElement;
+  if (isNewNodeSelected || shouldUpdateEditButton) {
+    if (showContextPanel) {
+      clearEditingContext(state, dispatch);
+      return;
+    }
+    var extensionType = node.attrs.extensionType;
+    var extensionHandler = extensionHandlers[extensionType];
+
+    // showEditButton might change async based on results from extension providers
+    var _showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
+    var updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(function () {
+      // do nothing;
+    });
+    updateState({
+      localId: node.attrs.localId,
+      showContextPanel: false,
+      element: newElement,
+      showEditButton: _showEditButton,
+      updateExtension: updateExtension
+    })(state, dispatch);
+  }
+  // New DOM element doesn't necessarily mean it's a new Node
+  else if (element !== newElement) {
+    updateState({
+      element: newElement
+    })(state, dispatch);
+  }
+  return true;
+};
 var createPlugin = function createPlugin(dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher) {
   var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var options = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
@@ -225,67 +219,13 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
       providerFactory.subscribe('extensionProvider', extensionProviderHandler);
       providerFactory.subscribe('contextIdentificationProvider', contextIdentificationProviderHandler);
       return {
-        update: function update(view) {
-          var state = view.state,
-            dispatch = view.dispatch;
-          var _getPluginState = getPluginState(state),
-            element = _getPluginState.element,
-            localId = _getPluginState.localId,
-            extensionProvider = _getPluginState.extensionProvider,
-            showContextPanel = _getPluginState.showContextPanel;
-
-          // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
-          var selectedExtension = getSelectedExtension(state, true);
-          if (!selectedExtension) {
-            if (showContextPanel) {
-              clearEditingContext(state, dispatch);
-            }
-
-            // if an extension is no longer selected, but the plugin has cached the previous selected extension id/ref
-            // then this should clear those values so that if an exention is selected again, then this sees it as a change
-            // and updates the state correctly.
-            if (!!localId || !!element) {
-              updateState({
-                localId: undefined,
-                element: undefined
-              })(state, dispatch);
-            }
-            return;
-          }
-          var node = selectedExtension.node;
-          var newElement = getSelectedDomElement(state.schema, domAtPos, selectedExtension);
-
-          // New node is selection
-          if (node.attrs.localId ? localId !== node.attrs.localId :
-          // This is the current assumption and it's wrong but we are keeping it
-          // as fallback in case we need to turn off `allowLocalIdGeneration`
-          element !== newElement) {
-            if (showContextPanel) {
-              clearEditingContext(state, dispatch);
-            }
-            var extensionType = node.attrs.extensionType;
-            var extensionHandler = extensionHandlers[extensionType];
-
-            // showEditButton might change async based on results from extension providers
-            var showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
-            var updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(function () {
-              // do nothing;
-            });
-            updateState({
-              localId: node.attrs.localId,
-              showContextPanel: false,
-              element: newElement,
-              showEditButton: showEditButton,
-              updateExtension: updateExtension
-            })(state, dispatch);
-          }
-          // New DOM element doesn't necessarily mean it's a new Node
-          else if (element !== newElement) {
-            updateState({
-              element: newElement
-            })(state, dispatch);
-          }
-          return true;
+        update: function update(view, prevState) {
+          handleUpdate({
+            view: view,
+            prevState: prevState,
+            domAtPos: domAtPos,
+            extensionHandlers: extensionHandlers
+          });
         },
         destroy: function destroy() {
           providerFactory.unsubscribe('extensionProvider', extensionProviderHandler);

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

@@ -0,0 +1,72 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { getExtensionModuleNode } from '@atlaskit/editor-common/extensions';
+import { updateState } from '../commands';
+import { getSelectedExtension } from '../utils';
+var maybeGetUpdateMethodFromExtensionProvider = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(view, extensionProvider) {
+    var nodeWithPos, _nodeWithPos$node$att, extensionType, extensionKey, extensionModuleNode, newNodeWithPos;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            nodeWithPos = getSelectedExtension(view.state, true);
+            if (nodeWithPos) {
+              _context.next = 3;
+              break;
+            }
+            throw new Error('There is no selection');
+          case 3:
+            _nodeWithPos$node$att = nodeWithPos.node.attrs, extensionType = _nodeWithPos$node$att.extensionType, extensionKey = _nodeWithPos$node$att.extensionKey;
+            _context.next = 6;
+            return getExtensionModuleNode(extensionProvider, extensionType, extensionKey);
+          case 6:
+            extensionModuleNode = _context.sent;
+            newNodeWithPos = getSelectedExtension(view.state, true);
+            if (!(newNodeWithPos && newNodeWithPos.node.attrs.extensionType === extensionType && newNodeWithPos.node.attrs.extensionKey === extensionKey && newNodeWithPos.pos === nodeWithPos.pos && extensionModuleNode)) {
+              _context.next = 10;
+              break;
+            }
+            return _context.abrupt("return", extensionModuleNode.update);
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return function maybeGetUpdateMethodFromExtensionProvider(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export var updateEditButton = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(view, extensionProvider) {
+    var updateMethod;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            _context2.next = 3;
+            return maybeGetUpdateMethodFromExtensionProvider(view, extensionProvider);
+          case 3:
+            updateMethod = _context2.sent;
+            updateState({
+              showEditButton: !!updateMethod,
+              updateExtension: updateMethod && Promise.resolve(updateMethod) || undefined
+            })(view.state, view.dispatch);
+            return _context2.abrupt("return", updateMethod);
+          case 8:
+            _context2.prev = 8;
+            _context2.t0 = _context2["catch"](0);
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2, null, [[0, 8]]);
+  }));
+  return function updateEditButton(_x3, _x4) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/esm/plugins/feature-flags-context/get-enabled-feature-flag-keys.js

@@ -1,10 +1 @@
-/**
- * Transforms FeatureFlags to a type safe string array of the enabled feature flags.
- *
- * Useful for analytics and analysis purposes.
- */
-export function getEnabledFeatureFlagKeys(featureFlags) {
-  return Object.keys(featureFlags).filter(function (key) {
-    return featureFlags[key] === true;
-  });
-}
+export { getEnabledFeatureFlagKeys } from '@atlaskit/editor-common/normalize-feature-flags';

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

@@ -5,7 +5,6 @@ import { cancelSearchWithAnalytics, replaceWithAnalytics, replaceAllWithAnalytic
 import { blur, toggleMatchCase } from './commands';
 import FindReplaceToolbarButton from './ui/FindReplaceToolbarButton';
 import { TRIGGER_METHOD } from '../analytics';
-import { getFeatureFlags } from '../feature-flags-context';
 var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithState(props) {
   var popupsBoundariesElement = props.popupsBoundariesElement,
     popupsMountPoint = props.popupsMountPoint,
@@ -13,7 +12,8 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
     isToolbarReducedSpacing = props.isToolbarReducedSpacing,
     editorView = props.editorView,
     containerElement = props.containerElement,
-    dispatchAnalyticsEvent = props.dispatchAnalyticsEvent;
+    dispatchAnalyticsEvent = props.dispatchAnalyticsEvent,
+    featureFlags = props.featureFlags;
   if (!editorView) {
     return null;
   }
@@ -95,8 +95,7 @@ var FindReplaceToolbarButtonWithState = function FindReplaceToolbarButtonWithSta
   var handleToggleMatchCase = function handleToggleMatchCase() {
     dispatchCommand(toggleMatchCase());
   };
-  var _getFeatureFlags = getFeatureFlags(editorView.state),
-    findReplaceMatchCase = _getFeatureFlags.findReplaceMatchCase;
+  var findReplaceMatchCase = featureFlags.findReplaceMatchCase;
   return /*#__PURE__*/React.createElement(WithPluginState, {
     debounce: false,
     plugins: {

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

@@ -2,7 +2,9 @@ import React from 'react';
 import { createPlugin } from './plugin';
 import keymapPlugin from './keymap';
 import FindReplaceToolbarButtonWithState from './FindReplaceToolbarButtonWithState';
-export var findReplacePlugin = function findReplacePlugin(props) {
+export var findReplacePlugin = function findReplacePlugin(props, api) {
+  var _api$dependencies, _api$dependencies$fea;
+  var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
   return {
     name: 'findReplace',
     pmPlugins: function pmPlugins() {
@@ -38,7 +40,8 @@ export var findReplacePlugin = function findReplacePlugin(props) {
           editorView: editorView,
           containerElement: containerElement,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-          takeFullWidth: props.takeFullWidth
+          takeFullWidth: props.takeFullWidth,
+          featureFlags: featureFlags
         });
       }
     }

package/dist/esm/plugins/floating-toolbar/index.js

@@ -22,7 +22,6 @@ import { ConfirmationModal } from './ui/ConfirmationModal';
 import { ToolbarLoader } from './ui/ToolbarLoader';
 import { findNode } from './utils';
 import { ErrorBoundary } from '../../ui/ErrorBoundary';
-import { getFeatureFlags } from '../feature-flags-context';
 import { processCopyButtonItems } from '../copy-button/toolbar';
 import forceFocusPlugin from './pm-plugins/force-focus';
 export var getRelevantConfig = function getRelevantConfig(selection, configs) {
@@ -114,7 +113,9 @@ var getDomRefFromSelection = function getDomRefFromSelection(view, dispatchAnaly
 function filterUndefined(x) {
   return !!x;
 }
-var floatingToolbarPlugin = function floatingToolbarPlugin() {
+var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
+  var _api$dependencies, _api$dependencies$fea;
+  var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
   return {
     name: 'floatingToolbar',
     pmPlugins: function pmPlugins() {
@@ -208,7 +209,7 @@ var floatingToolbarPlugin = function floatingToolbarPlugin() {
           var _ref5 = floatingToolbarData || {},
             confirmDialogForItem = _ref5.confirmDialogForItem;
           var confirmButtonItem = confirmDialogForItem ? toolbarItems[confirmDialogForItem] : undefined;
-          var scrollable = getFeatureFlags(editorView.state).floatingToolbarCopyButton && config.scrollable;
+          var scrollable = featureFlags.floatingToolbarCopyButton && config.scrollable;
           var confirmDialogOptions = typeof (confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog) === 'function' ? confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog() : confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog;
           return /*#__PURE__*/React.createElement(ErrorBoundary, {
             component: ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
@@ -251,8 +252,10 @@ var floatingToolbarPlugin = function floatingToolbarPlugin() {
             popupsScrollableElement: popupsScrollableElement,
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
             extensionsProvider: extensionsState === null || extensionsState === void 0 ? void 0 : extensionsState.extensionProvider,
-            scrollable: scrollable
+            scrollable: scrollable,
+            featureFlags: featureFlags
           })), /*#__PURE__*/React.createElement(ConfirmationModal, {
+            testId: "ak-floating-toolbar-confirmation-modal",
             options: confirmDialogOptions,
             onConfirm: function onConfirm() {
               var isChecked = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -261,11 +264,16 @@ var floatingToolbarPlugin = function floatingToolbarPlugin() {
               } else {
                 dispatchCommand(confirmButtonItem.onClick);
               }
-              dispatchCommand(hideConfirmDialog());
-            } // When closed without clicking OK or cancel buttons
-            ,
+            },
             onClose: function onClose() {
               dispatchCommand(hideConfirmDialog());
+              // Need to set focus to Editor here,
+              // As when the Confirmation dialog pop up, and user interacts with the dialog, Editor loses focus.
+              // So when Confirmation dialog is closed, Editor does not have the focus, then cursor goes to the position 1 of the doc,
+              // instead of the cursor position before the dialog pop up.
+              if (!editorView.hasFocus()) {
+                editorView.focus();
+              }
             }
           }));
         }

package/dist/esm/plugins/floating-toolbar/ui/CheckboxModal.js

@@ -64,7 +64,8 @@ export var CheckboxModal = function CheckboxModal(props) {
   }, cancelButtonLabel), /*#__PURE__*/React.createElement(Button, {
     appearance: "warning",
     onClick: function onClick() {
-      return onConfirm(isChecked);
+      onConfirm(isChecked);
+      onClose();
     },
     testId: testId ? "".concat(testId, "-confirm-button") : undefined
   }, okButtonLabel)));

package/dist/esm/plugins/floating-toolbar/ui/EmojiPickerButton.js

@@ -32,8 +32,11 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
   };
   var updateEmoji = function updateEmoji(emoji) {
     setIsPopupOpen(false);
-    props.editorView && props.editorView.focus();
     props.onChange && props.onChange(emoji);
+    requestAnimationFrame(function () {
+      var _props$editorView;
+      (_props$editorView = props.editorView) === null || _props$editorView === void 0 ? void 0 : _props$editorView.focus();
+    });
   };
   var isDetachedElement = function isDetachedElement(el) {
     return !document.body.contains(el);
@@ -47,6 +50,11 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
       togglePopup();
     }
   };
+  var handleEmojiPressEscape = function handleEmojiPressEscape() {
+    var _buttonRef$current;
+    setIsPopupOpen(false);
+    (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
+  };
   var renderPicker = function renderPicker(providers) {
     if (!providers.emojiProvider) {
       return null;
@@ -55,7 +63,8 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
       emojiProvider: providers.emojiProvider,
       onSelection: updateEmoji,
       onPickerRef: function onPickerRef() {},
-      handleClickOutside: handleEmojiClickOutside
+      handleClickOutside: handleEmojiClickOutside,
+      handleEscapeKeydown: handleEmojiPressEscape
     });
   };
   var renderPopup = function renderPopup() {
@@ -72,7 +81,8 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
       // if the toolbar is scrollable, this will be mounted in the root editor
       // we need an index of > 500 to display over it
       ,
-      zIndex: props.setDisableParentScroll ? 600 : undefined
+      zIndex: props.setDisableParentScroll ? 600 : undefined,
+      focusTrap: true
     }, jsx(WithProviders, {
       providers: ['emojiProvider'],
       providerFactory: props.providerFactory,

package/dist/esm/plugins/floating-toolbar/ui/SimpleModal.js

@@ -23,7 +23,8 @@ export var SimpleModal = function SimpleModal(props) {
   }, cancelButtonLabel), /*#__PURE__*/React.createElement(Button, {
     appearance: "warning",
     onClick: function onClick() {
-      return onConfirm();
+      onConfirm();
+      onClose();
     },
     testId: testId ? "".concat(testId, "-confirm-button") : undefined
   }, okButtonLabel)));