@atlaskit/editor-plugin-floating-toolbar 4.1.9 → 4.1.12

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 4.1.12
+
+### Patch Changes
+
+- [#160940](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/160940)
+  [`d63ae1c3f13d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d63ae1c3f13d9) -
+  Hide loading of floating toolbar in SSR environment
+- Updated dependencies
+
+## 4.1.11
+
+### Patch Changes
+
+- [#159090](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159090)
+  [`9cbae97c20f84`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9cbae97c20f84) -
+  Reduces rerenders of text formatting options and the toolbar when it is docked to top.
+- Updated dependencies
+
+## 4.1.10
+
+### Patch Changes
+
+- [#159655](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159655)
+  [`24f8c627d50f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/24f8c627d50f2) - ##
+  WHAT? Remove experimental graceful edit mode from view mode plugin and associated props.
+
+  ## WHY?
+
+  This experiment is being cleaned up and we are no longer proceeding in this direction.
+
+  ## HOW to adjust?
+
+  This experiment was only enabled for Confluence and should not have been enabled in other places.
+  If for some reason any of the following props/state/methdos were used please remove them:
+
+  - isConsumption
+  - contentMode
+  - initialContentMode
+  - updateContentMode
+
+- Updated dependencies
+
 ## 4.1.9
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -14,6 +14,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _react = _interopRequireDefault(require("react"));
 var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
@@ -31,7 +32,6 @@ var _plugin = require("./pm-plugins/toolbar-data/plugin");
 var _pluginKey = require("./pm-plugins/toolbar-data/plugin-key");
 var _utils2 = require("./pm-plugins/utils");
 var _ConfirmationModal = require("./ui/ConfirmationModal");
-var _ExpandButton = require("./ui/ExpandButton");
 var _ToolbarLoader = require("./ui/ToolbarLoader");
 var _utils3 = require("./ui/utils");
 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); }
@@ -225,8 +225,6 @@ var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (
 
   // editorViewMode
   var mode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'editorViewMode.mode');
-  var contentMode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'editorViewMode.contentMode');
-  var isConsumption = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'editorViewMode.isConsumption');
 
   // userIntent
   var currentUserIntent = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'userIntent.currentUserIntent');
@@ -244,8 +242,6 @@ var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (
     floatingToolbarData: floatingToolbarData,
     editorDisabled: editorDisabledState,
     mode: mode,
-    contentMode: contentMode,
-    isConsumption: isConsumption,
     currentUserIntent: currentUserIntent,
     isDragging: isDragging,
     isMenuOpen: isMenuOpen
@@ -264,8 +260,6 @@ var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (
     floatingToolbarData: floatingToolbarState === null || floatingToolbarState === void 0 ? void 0 : floatingToolbarState.floatingToolbarData,
     editorDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled,
     mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    contentMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.contentMode,
-    isConsumption: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.isConsumption,
     currentUserIntent: userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent,
     isDragging: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isDragging,
     isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen
@@ -282,14 +276,17 @@ function ContentComponent(_ref5) {
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
   var _useSharedState = useSharedState(pluginInjectionApi),
     configWithNodeInfo = _useSharedState.configWithNodeInfo,
-    contentMode = _useSharedState.contentMode,
     currentUserIntent = _useSharedState.currentUserIntent,
     editorDisabled = _useSharedState.editorDisabled,
     floatingToolbarData = _useSharedState.floatingToolbarData,
-    isConsumption = _useSharedState.isConsumption,
     isDragging = _useSharedState.isDragging,
     isMenuOpen = _useSharedState.isMenuOpen,
     mode = _useSharedState.mode;
+  if ((0, _coreUtils.isSSR)() && (0, _experiments.editorExperiment)('platform_editor_hide_floating_toolbar_in_ssr', true, {
+    exposure: true
+  })) {
+    return null;
+  }
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
@@ -386,39 +383,6 @@ function ContentComponent(_ref5) {
   }
   var customPositionCalculation;
   var toolbarItems = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.copyButton) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.processCopyButtonItems(editorView.state)(Array.isArray(items) ? items : items(node), pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions.hoverDecoration);
-  var viewModeToolbarEntry = (0, _experiments.unstable_editorExperimentParam)('live_pages_graceful_edit', 'toolbar-entry', {
-    defaultValue: 'none',
-    typeGuard: function typeGuard(value) {
-      return typeof value === 'string' && ['text', 'nodes'].includes(value);
-    }
-  });
-  if (!(0, _experiments.editorExperiment)('live_pages_graceful_edit', 'control') && viewModeToolbarEntry !== 'none') {
-    if (contentMode === 'live-edit' && isConsumption) {
-      var hasOtherToolbarItems = toolbarItems && toolbarItems.length !== 0;
-      var shouldAddToolbarItems = viewModeToolbarEntry === 'expand-existing-only' ? hasOtherToolbarItems : true;
-      if (shouldAddToolbarItems) {
-        if (toolbarItems && toolbarItems.length > 0) {
-          toolbarItems.unshift({
-            type: 'separator'
-          });
-        }
-        toolbarItems === null || toolbarItems === void 0 || toolbarItems.unshift({
-          type: 'button',
-          title: 'Edit',
-          onClick: function onClick() {
-            var _pluginInjectionApi$c2, _pluginInjectionApi$e;
-            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.core) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.actions) === null || _pluginInjectionApi$c2 === void 0 || _pluginInjectionApi$c2.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.commands.updateContentMode({
-              type: 'intent-to-edit'
-            }));
-            return false;
-          },
-          icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_ExpandButton.ExpandButton, null);
-          }
-        });
-      }
-    }
-  }
   if (onPositionCalculated) {
     customPositionCalculation = function customPositionCalculation(nextPos) {
       return onPositionCalculated(editorView, nextPos);

package/dist/cjs/ui/Toolbar.js

@@ -571,6 +571,10 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       event.stopPropagation();
       event.preventDefault();
     });
+    (0, _defineProperty2.default)(_this, "isShortcutToFocusToolbar", function (event) {
+      //Alt + F10 to reach first element in this floating toolbar
+      return event.altKey && (event.key === 'F10' || event.keyCode === 121);
+    });
     _this.scrollContainerRef = /*#__PURE__*/_react.default.createRef();
     _this.mountRef = /*#__PURE__*/_react.default.createRef();
     _this.toolbarContainerRef = /*#__PURE__*/_react.default.createRef();
@@ -699,7 +703,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         handleEscape: this.handleEscape,
         disableArrowKeyNavigation: !this.shouldHandleArrowKeys(),
         childComponentSelector: "[data-testid='editor-floating-toolbar']",
-        isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+        isShortcutToFocusToolbar: (0, _platformFeatureFlags.fg)('platform_editor_toolbar_rerender_optimization') ? this.isShortcutToFocusToolbar : isShortcutToFocusToolbar,
         intl: intl
       }, (0, _react2.jsx)("div", {
         ref: this.toolbarContainerRef,

package/dist/es2019/floatingToolbarPlugin.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import camelCase from 'lodash/camelCase';
 import { ACTION, ACTION_SUBJECT, CONTENT_COMPONENT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
@@ -10,7 +11,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment, unstable_editorExperimentParam } from '@atlaskit/tmp-editor-statsig/experiments';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
@@ -18,7 +19,6 @@ import { createPlugin as floatingToolbarDataPluginFactory } from './pm-plugins/t
 import { pluginKey as dataPluginKey } from './pm-plugins/toolbar-data/plugin-key';
 import { findNode } from './pm-plugins/utils';
 import { ConfirmationModal } from './ui/ConfirmationModal';
-import { ExpandButton } from './ui/ExpandButton';
 import { ToolbarLoader } from './ui/ToolbarLoader';
 import { consolidateOverflowDropdownItems } from './ui/utils';
 
@@ -208,8 +208,6 @@ const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi =
 
   // editorViewMode
   const mode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
-  const contentMode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.contentMode');
-  const isConsumption = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.isConsumption');
 
   // userIntent
   const currentUserIntent = useSharedPluginStateSelector(pluginInjectionApi, 'userIntent.currentUserIntent');
@@ -227,8 +225,6 @@ const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi =
     floatingToolbarData,
     editorDisabled: editorDisabledState,
     mode,
-    contentMode,
-    isConsumption,
     currentUserIntent,
     isDragging,
     isMenuOpen
@@ -249,8 +245,6 @@ const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi =
     floatingToolbarData: floatingToolbarState === null || floatingToolbarState === void 0 ? void 0 : floatingToolbarState.floatingToolbarData,
     editorDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled,
     mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    contentMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.contentMode,
-    isConsumption: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.isConsumption,
     currentUserIntent: userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent,
     isDragging: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isDragging,
     isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen
@@ -268,15 +262,18 @@ export function ContentComponent({
   var _configWithNodeInfo$c, _configWithNodeInfo$c2, _items, _pluginInjectionApi$c, _pluginInjectionApi$d;
   const {
     configWithNodeInfo,
-    contentMode,
     currentUserIntent,
     editorDisabled,
     floatingToolbarData,
-    isConsumption,
     isDragging,
     isMenuOpen,
     mode
   } = useSharedState(pluginInjectionApi);
+  if (isSSR() && editorExperiment('platform_editor_hide_floating_toolbar_in_ssr', true, {
+    exposure: true
+  })) {
+    return null;
+  }
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
@@ -368,35 +365,6 @@ export function ContentComponent({
   }
   let customPositionCalculation;
   const toolbarItems = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.copyButton) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.processCopyButtonItems(editorView.state)(Array.isArray(items) ? items : items(node), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions.hoverDecoration);
-  const viewModeToolbarEntry = unstable_editorExperimentParam('live_pages_graceful_edit', 'toolbar-entry', {
-    defaultValue: 'none',
-    typeGuard: value => typeof value === 'string' && ['text', 'nodes'].includes(value)
-  });
-  if (!editorExperiment('live_pages_graceful_edit', 'control') && viewModeToolbarEntry !== 'none') {
-    if (contentMode === 'live-edit' && isConsumption) {
-      const hasOtherToolbarItems = toolbarItems && toolbarItems.length !== 0;
-      const shouldAddToolbarItems = viewModeToolbarEntry === 'expand-existing-only' ? hasOtherToolbarItems : true;
-      if (shouldAddToolbarItems) {
-        if (toolbarItems && toolbarItems.length > 0) {
-          toolbarItems.unshift({
-            type: 'separator'
-          });
-        }
-        toolbarItems === null || toolbarItems === void 0 ? void 0 : toolbarItems.unshift({
-          type: 'button',
-          title: 'Edit',
-          onClick: () => {
-            var _pluginInjectionApi$c2, _pluginInjectionApi$c3, _pluginInjectionApi$e;
-            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c2 = pluginInjectionApi.core) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : (_pluginInjectionApi$c3 = _pluginInjectionApi$c2.actions) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : _pluginInjectionApi$c3.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.commands.updateContentMode({
-              type: 'intent-to-edit'
-            }));
-            return false;
-          },
-          icon: () => /*#__PURE__*/React.createElement(ExpandButton, null)
-        });
-      }
-    }
-  }
   if (onPositionCalculated) {
     customPositionCalculation = nextPos => {
       return onPositionCalculated(editorView, nextPos);

package/dist/es2019/ui/Toolbar.js

@@ -531,6 +531,10 @@ class Toolbar extends Component {
       event.stopPropagation();
       event.preventDefault();
     });
+    _defineProperty(this, "isShortcutToFocusToolbar", event => {
+      //Alt + F10 to reach first element in this floating toolbar
+      return event.altKey && (event.key === 'F10' || event.keyCode === 121);
+    });
     this.scrollContainerRef = /*#__PURE__*/React.createRef();
     this.mountRef = /*#__PURE__*/React.createRef();
     this.toolbarContainerRef = /*#__PURE__*/React.createRef();
@@ -650,7 +654,7 @@ class Toolbar extends Component {
       handleEscape: this.handleEscape,
       disableArrowKeyNavigation: !this.shouldHandleArrowKeys(),
       childComponentSelector: "[data-testid='editor-floating-toolbar']",
-      isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+      isShortcutToFocusToolbar: fg('platform_editor_toolbar_rerender_optimization') ? this.isShortcutToFocusToolbar : isShortcutToFocusToolbar,
       intl: intl
     }, jsx("div", {
       ref: this.toolbarContainerRef,

package/dist/esm/floatingToolbarPlugin.js

@@ -5,6 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import camelCase from 'lodash/camelCase';
 import { ACTION, ACTION_SUBJECT, CONTENT_COMPONENT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
@@ -14,7 +15,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment, unstable_editorExperimentParam } from '@atlaskit/tmp-editor-statsig/experiments';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyNode as _copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
@@ -22,7 +23,6 @@ import { createPlugin as floatingToolbarDataPluginFactory } from './pm-plugins/t
 import { pluginKey as dataPluginKey } from './pm-plugins/toolbar-data/plugin-key';
 import { findNode } from './pm-plugins/utils';
 import { ConfirmationModal } from './ui/ConfirmationModal';
-import { ExpandButton } from './ui/ExpandButton';
 import { ToolbarLoader } from './ui/ToolbarLoader';
 import { consolidateOverflowDropdownItems } from './ui/utils';
 
@@ -213,8 +213,6 @@ var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInject
 
   // editorViewMode
   var mode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
-  var contentMode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.contentMode');
-  var isConsumption = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.isConsumption');
 
   // userIntent
   var currentUserIntent = useSharedPluginStateSelector(pluginInjectionApi, 'userIntent.currentUserIntent');
@@ -232,8 +230,6 @@ var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInject
     floatingToolbarData: floatingToolbarData,
     editorDisabled: editorDisabledState,
     mode: mode,
-    contentMode: contentMode,
-    isConsumption: isConsumption,
     currentUserIntent: currentUserIntent,
     isDragging: isDragging,
     isMenuOpen: isMenuOpen
@@ -252,8 +248,6 @@ var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInject
     floatingToolbarData: floatingToolbarState === null || floatingToolbarState === void 0 ? void 0 : floatingToolbarState.floatingToolbarData,
     editorDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled,
     mode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode,
-    contentMode: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.contentMode,
-    isConsumption: editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.isConsumption,
     currentUserIntent: userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent,
     isDragging: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isDragging,
     isMenuOpen: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.isMenuOpen
@@ -270,14 +264,17 @@ export function ContentComponent(_ref5) {
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
   var _useSharedState = useSharedState(pluginInjectionApi),
     configWithNodeInfo = _useSharedState.configWithNodeInfo,
-    contentMode = _useSharedState.contentMode,
     currentUserIntent = _useSharedState.currentUserIntent,
     editorDisabled = _useSharedState.editorDisabled,
     floatingToolbarData = _useSharedState.floatingToolbarData,
-    isConsumption = _useSharedState.isConsumption,
     isDragging = _useSharedState.isDragging,
     isMenuOpen = _useSharedState.isMenuOpen,
     mode = _useSharedState.mode;
+  if (isSSR() && editorExperiment('platform_editor_hide_floating_toolbar_in_ssr', true, {
+    exposure: true
+  })) {
+    return null;
+  }
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
@@ -374,39 +371,6 @@ export function ContentComponent(_ref5) {
   }
   var customPositionCalculation;
   var toolbarItems = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.copyButton) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.processCopyButtonItems(editorView.state)(Array.isArray(items) ? items : items(node), pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions.hoverDecoration);
-  var viewModeToolbarEntry = unstable_editorExperimentParam('live_pages_graceful_edit', 'toolbar-entry', {
-    defaultValue: 'none',
-    typeGuard: function typeGuard(value) {
-      return typeof value === 'string' && ['text', 'nodes'].includes(value);
-    }
-  });
-  if (!editorExperiment('live_pages_graceful_edit', 'control') && viewModeToolbarEntry !== 'none') {
-    if (contentMode === 'live-edit' && isConsumption) {
-      var hasOtherToolbarItems = toolbarItems && toolbarItems.length !== 0;
-      var shouldAddToolbarItems = viewModeToolbarEntry === 'expand-existing-only' ? hasOtherToolbarItems : true;
-      if (shouldAddToolbarItems) {
-        if (toolbarItems && toolbarItems.length > 0) {
-          toolbarItems.unshift({
-            type: 'separator'
-          });
-        }
-        toolbarItems === null || toolbarItems === void 0 || toolbarItems.unshift({
-          type: 'button',
-          title: 'Edit',
-          onClick: function onClick() {
-            var _pluginInjectionApi$c2, _pluginInjectionApi$e;
-            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.core) === null || _pluginInjectionApi$c2 === void 0 || (_pluginInjectionApi$c2 = _pluginInjectionApi$c2.actions) === null || _pluginInjectionApi$c2 === void 0 || _pluginInjectionApi$c2.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.commands.updateContentMode({
-              type: 'intent-to-edit'
-            }));
-            return false;
-          },
-          icon: function icon() {
-            return /*#__PURE__*/React.createElement(ExpandButton, null);
-          }
-        });
-      }
-    }
-  }
   if (onPositionCalculated) {
     customPositionCalculation = function customPositionCalculation(nextPos) {
       return onPositionCalculated(editorView, nextPos);

package/dist/esm/ui/Toolbar.js

@@ -564,6 +564,10 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       event.stopPropagation();
       event.preventDefault();
     });
+    _defineProperty(_this, "isShortcutToFocusToolbar", function (event) {
+      //Alt + F10 to reach first element in this floating toolbar
+      return event.altKey && (event.key === 'F10' || event.keyCode === 121);
+    });
     _this.scrollContainerRef = /*#__PURE__*/React.createRef();
     _this.mountRef = /*#__PURE__*/React.createRef();
     _this.toolbarContainerRef = /*#__PURE__*/React.createRef();
@@ -692,7 +696,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         handleEscape: this.handleEscape,
         disableArrowKeyNavigation: !this.shouldHandleArrowKeys(),
         childComponentSelector: "[data-testid='editor-floating-toolbar']",
-        isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+        isShortcutToFocusToolbar: fg('platform_editor_toolbar_rerender_optimization') ? this.isShortcutToFocusToolbar : isShortcutToFocusToolbar,
         intl: intl
       }, jsx("div", {
         ref: this.toolbarContainerRef,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "4.1.9",
+	"version": "4.1.12",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -25,32 +25,32 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-utils": "^19.19.0",
+		"@atlaskit/adf-utils": "^19.20.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/checkbox": "^17.1.0",
-		"@atlaskit/editor-common": "^105.8.0",
+		"@atlaskit/editor-common": "^105.11.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-context-panel": "^4.1.0",
 		"@atlaskit/editor-plugin-copy-button": "^2.0.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
-		"@atlaskit/editor-plugin-emoji": "^3.6.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^4.0.0",
+		"@atlaskit/editor-plugin-emoji": "^3.7.0",
 		"@atlaskit/editor-plugin-extension": "^5.4.0",
 		"@atlaskit/editor-plugin-interaction": "^1.1.0",
-		"@atlaskit/editor-plugin-table": "^10.10.0",
+		"@atlaskit/editor-plugin-table": "^10.11.0",
 		"@atlaskit/editor-plugin-user-intent": "^0.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/emoji": "^69.2.0",
-		"@atlaskit/icon": "^26.1.0",
+		"@atlaskit/icon": "^26.3.0",
 		"@atlaskit/menu": "^8.0.0",
 		"@atlaskit/modal-dialog": "^14.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.8.0",
 		"@atlaskit/select": "^20.6.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.24.0",
+		"@atlaskit/tmp-editor-statsig": "^5.1.0",
 		"@atlaskit/tokens": "^4.9.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -154,6 +154,9 @@
 		},
 		"platform_editor_interaction_api_refactor": {
 			"type": "boolean"
+		},
+		"platform_editor_toolbar_rerender_optimization": {
+			"type": "boolean"
 		}
 	}
 }