@atlaskit/editor-plugin-floating-toolbar 4.1.13 → 4.1.15

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 4.1.15
+
+### Patch Changes
+
+- [#164168](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/164168)
+  [`d8a91ac7d6399`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d8a91ac7d6399) -
+  Revert to using useSharedPluginState in `floatingToolbarPlugin`
+- Updated dependencies
+
+## 4.1.14
+
+### Patch Changes
+
+- [#161914](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/161914)
+  [`b1a7ef0ae8d44`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b1a7ef0ae8d44) -
+  Switches text formatting options optimisation from FG to Experiment flag
+- Updated dependencies
+
 ## 4.1.13
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -20,7 +20,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _ui = require("@atlaskit/editor-common/ui");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -34,8 +33,7 @@ var _utils2 = require("./pm-plugins/utils");
 var _ConfirmationModal = require("./ui/ConfirmationModal");
 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); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // TODO: AFP-2532 - Fix automatic suppressions below
@@ -215,56 +213,6 @@ var floatingToolbarPlugin = exports.floatingToolbarPlugin = function floatingToo
     }
   };
 };
-var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (pluginInjectionApi) {
-  // floatingToolbar
-  var configWithNodeInfo = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'floatingToolbar.configWithNodeInfo');
-  var floatingToolbarData = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'floatingToolbar.floatingToolbarData');
-
-  // editorDisabled
-  var editorDisabledState = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'editorDisabled.editorDisabled');
-
-  // editorViewMode
-  var mode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'editorViewMode.mode');
-
-  // userIntent
-  var currentUserIntent = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'userIntent.currentUserIntent');
-
-  // blockControls
-  var isDragging = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi,
-  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-  'blockControls.isDragging');
-  // isMenuOpen
-  var isMenuOpen = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi,
-  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-  'blockControls.isMenuOpen');
-  return {
-    configWithNodeInfo: configWithNodeInfo,
-    floatingToolbarData: floatingToolbarData,
-    editorDisabled: editorDisabledState,
-    mode: mode,
-    currentUserIntent: currentUserIntent,
-    isDragging: isDragging,
-    isMenuOpen: isMenuOpen
-  };
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
-    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-    'blockControls']),
-    floatingToolbarState = _useSharedPluginState.floatingToolbarState,
-    editorDisabledState = _useSharedPluginState.editorDisabledState,
-    editorViewModeState = _useSharedPluginState.editorViewModeState,
-    userIntentState = _useSharedPluginState.userIntentState,
-    blockControlsState = _useSharedPluginState.blockControlsState;
-  return {
-    configWithNodeInfo: floatingToolbarState === null || floatingToolbarState === void 0 ? void 0 : floatingToolbarState.configWithNodeInfo,
-    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,
-    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
-  };
-});
 function ContentComponent(_ref5) {
   var _configWithNodeInfo$c, _configWithNodeInfo$c2, _items, _pluginInjectionApi$c, _pluginInjectionApi$d;
   var pluginInjectionApi = _ref5.pluginInjectionApi,
@@ -274,24 +222,27 @@ function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedState = useSharedState(pluginInjectionApi),
-    configWithNodeInfo = _useSharedState.configWithNodeInfo,
-    currentUserIntent = _useSharedState.currentUserIntent,
-    editorDisabled = _useSharedState.editorDisabled,
-    floatingToolbarData = _useSharedState.floatingToolbarData,
-    isDragging = _useSharedState.isDragging,
-    isMenuOpen = _useSharedState.isMenuOpen,
-    mode = _useSharedState.mode;
-  if ((0, _coreUtils.isSSR)() && (0, _experiments.editorExperiment)('platform_editor_hide_floating_toolbar_in_ssr', true, {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
+    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
+    'blockControls']),
+    floatingToolbarState = _useSharedPluginState.floatingToolbarState,
+    editorDisabledState = _useSharedPluginState.editorDisabledState,
+    editorViewModeState = _useSharedPluginState.editorViewModeState,
+    userIntentState = _useSharedPluginState.userIntentState,
+    blockControlsState = _useSharedPluginState.blockControlsState;
+  var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
+    configWithNodeInfo = _ref6.configWithNodeInfo,
+    floatingToolbarData = _ref6.floatingToolbarData;
+  if ((0, _experiments.editorExperiment)('platform_editor_hide_floating_toolbar_in_ssr', true, {
     exposure: true
-  })) {
+  }) && (0, _coreUtils.isSSR)()) {
     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;
   }
   if ((0, _platformFeatureFlags.fg)('platform_editor_user_intent_plugin')) {
-    if (currentUserIntent === 'dragging') {
+    if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
       return null;
     }
 
@@ -300,10 +251,10 @@ function ContentComponent(_ref5) {
     // 	return null;
     // }
   } else {
-    if (isDragging) {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
       return null;
     }
-    if (isMenuOpen && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
       return null;
     }
   }
@@ -339,8 +290,9 @@ function ContentComponent(_ref5) {
     _config$stick = config.stick,
     stick = _config$stick === void 0 ? true : _config$stick;
   var targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
-  var isInViewMode = mode === 'view';
-  if (!targetRef || editorDisabled && !isInViewMode) {
+  var isEditorDisabled = editorDisabledState && editorDisabledState.editorDisabled;
+  var isInViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
+  if (!targetRef || isEditorDisabled && !isInViewMode) {
     return null;
   }
 
@@ -393,8 +345,8 @@ function ContentComponent(_ref5) {
   };
 
   // Confirm dialog
-  var _ref6 = floatingToolbarData || {},
-    confirmDialogForItem = _ref6.confirmDialogForItem;
+  var _ref7 = floatingToolbarData || {},
+    confirmDialogForItem = _ref7.confirmDialogForItem;
   var confirmButtonItem = confirmDialogForItem ?
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/dist/cjs/ui/CheckboxModal.js

@@ -14,8 +14,7 @@ var _checkbox = require("@atlaskit/checkbox");
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
 var _compiled = require("@atlaskit/primitives/compiled");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var CheckboxModal = exports.CheckboxModal = function CheckboxModal(props) {
   var _options$getChildrenI;
   var _useState = (0, _react.useState)(false),

package/dist/cjs/ui/Dropdown.js

@@ -22,8 +22,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _Divider = require("./Divider");
 var _DropdownMenu = _interopRequireWildcard(require("./DropdownMenu"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }

package/dist/cjs/ui/EmojiPickerButton.js

@@ -19,8 +19,7 @@ var _emojiAdd = _interopRequireDefault(require("@atlaskit/icon/core/emoji-add"))
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _EditorEmojiAddIcon = _interopRequireDefault(require("./EditorEmojiAddIcon"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * @jsxRuntime classic
  * @jsx jsx

package/dist/cjs/ui/ExtensionsPlaceholder.js

@@ -18,8 +18,7 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _Dropdown = _interopRequireDefault(require("./Dropdown"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var noop = function noop() {
   return null;
 };

package/dist/cjs/ui/Input.js

@@ -10,8 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _ui = require("@atlaskit/editor-common/ui");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * @jsxRuntime classic
  * @jsx jsx

package/dist/cjs/ui/ScrollButton.js

@@ -15,8 +15,7 @@ var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _chevronLeftChevronLeftLarge = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-left--chevron-left-large"));
 var _chevronRightChevronRightLarge = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-right--chevron-right-large"));
 var _primitives = require("@atlaskit/primitives");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var rightSideStyles = (0, _primitives.xcss)({
   borderLeft: "solid ".concat("var(--ds-border, #091E4224)", " 1px"),
   right: 'space.0',

package/dist/cjs/ui/ScrollButtons.js

@@ -15,8 +15,7 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _chevronLeftChevronLeftLarge = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-left--chevron-left-large"));
 var _chevronRightChevronRightLarge = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-right--chevron-right-large"));
 var _colors = require("@atlaskit/theme/colors");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * @jsxRuntime classic
  * @jsx jsx

package/dist/cjs/ui/Select.js

@@ -9,8 +9,7 @@ exports.default = Search;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _select = _interopRequireDefault(require("@atlaskit/select"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
 function Search(props) {

package/dist/cjs/ui/SimpleModal.js

@@ -11,8 +11,7 @@ var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
 var _compiled = require("@atlaskit/primitives/compiled");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SimpleModal = exports.SimpleModal = function SimpleModal(props) {
   var onConfirm = props.onConfirm,
     onClose = props.onClose,

package/dist/cjs/ui/Toolbar.js

@@ -37,8 +37,7 @@ var _Input = require("./Input");
 var _ScrollButton = require("./ScrollButton");
 var _ScrollButtons = require("./ScrollButtons");
 var _Select = _interopRequireDefault(require("./Select"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation */ /**
  * @jsxRuntime classic
@@ -703,7 +702,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         handleEscape: this.handleEscape,
         disableArrowKeyNavigation: !this.shouldHandleArrowKeys(),
         childComponentSelector: "[data-testid='editor-floating-toolbar']",
-        isShortcutToFocusToolbar: (0, _platformFeatureFlags.fg)('platform_editor_toolbar_rerender_optimization') ? this.isShortcutToFocusToolbar : isShortcutToFocusToolbar,
+        isShortcutToFocusToolbar: (0, _experiments.editorExperiment)('platform_editor_toolbar_rerender_optimization_exp', true) ? this.isShortcutToFocusToolbar : isShortcutToFocusToolbar,
         intl: intl
       }, (0, _react2.jsx)("div", {
         ref: this.toolbarContainerRef,

package/dist/cjs/ui/ToolbarLoader.js

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ToolbarLoader = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var ToolbarLoader = exports.ToolbarLoader = (0, _reactLoadable.default)({
   loader: function loader() {
     return Promise.resolve().then(function () {

package/dist/es2019/floatingToolbarPlugin.js

@@ -3,11 +3,12 @@ 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 {
+// Deprecated API - Look at removing this sometime in the future
+useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -198,58 +199,6 @@ export const floatingToolbarPlugin = ({
     }
   };
 };
-const useSharedState = sharedPluginStateHookMigratorFactory(pluginInjectionApi => {
-  // floatingToolbar
-  const configWithNodeInfo = useSharedPluginStateSelector(pluginInjectionApi, 'floatingToolbar.configWithNodeInfo');
-  const floatingToolbarData = useSharedPluginStateSelector(pluginInjectionApi, 'floatingToolbar.floatingToolbarData');
-
-  // editorDisabled
-  const editorDisabledState = useSharedPluginStateSelector(pluginInjectionApi, 'editorDisabled.editorDisabled');
-
-  // editorViewMode
-  const mode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
-
-  // userIntent
-  const currentUserIntent = useSharedPluginStateSelector(pluginInjectionApi, 'userIntent.currentUserIntent');
-
-  // blockControls
-  const isDragging = useSharedPluginStateSelector(pluginInjectionApi,
-  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-  'blockControls.isDragging');
-  // isMenuOpen
-  const isMenuOpen = useSharedPluginStateSelector(pluginInjectionApi,
-  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-  'blockControls.isMenuOpen');
-  return {
-    configWithNodeInfo,
-    floatingToolbarData,
-    editorDisabled: editorDisabledState,
-    mode,
-    currentUserIntent,
-    isDragging,
-    isMenuOpen
-  };
-}, pluginInjectionApi => {
-  const {
-    floatingToolbarState,
-    editorDisabledState,
-    editorViewModeState,
-    userIntentState,
-    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-    blockControlsState
-  } = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
-  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-  'blockControls']);
-  return {
-    configWithNodeInfo: floatingToolbarState === null || floatingToolbarState === void 0 ? void 0 : floatingToolbarState.configWithNodeInfo,
-    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,
-    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
-  };
-});
 export function ContentComponent({
   pluginInjectionApi,
   editorView,
@@ -260,25 +209,30 @@ export function ContentComponent({
   dispatchAnalyticsEvent
 }) {
   var _configWithNodeInfo$c, _configWithNodeInfo$c2, _items, _pluginInjectionApi$c, _pluginInjectionApi$d;
+  const {
+    floatingToolbarState,
+    editorDisabledState,
+    editorViewModeState,
+    userIntentState,
+    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
+    blockControlsState
+  } = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
+  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
+  'blockControls']);
   const {
     configWithNodeInfo,
-    currentUserIntent,
-    editorDisabled,
-    floatingToolbarData,
-    isDragging,
-    isMenuOpen,
-    mode
-  } = useSharedState(pluginInjectionApi);
-  if (isSSR() && editorExperiment('platform_editor_hide_floating_toolbar_in_ssr', true, {
+    floatingToolbarData
+  } = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {};
+  if (editorExperiment('platform_editor_hide_floating_toolbar_in_ssr', true, {
     exposure: true
-  })) {
+  }) && isSSR()) {
     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;
   }
   if (fg('platform_editor_user_intent_plugin')) {
-    if (currentUserIntent === 'dragging') {
+    if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
       return null;
     }
 
@@ -287,10 +241,10 @@ export function ContentComponent({
     // 	return null;
     // }
   } else {
-    if (isDragging) {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
       return null;
     }
-    if (isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
       return null;
     }
   }
@@ -327,8 +281,9 @@ export function ContentComponent({
     stick = true
   } = config;
   const targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
-  const isInViewMode = mode === 'view';
-  if (!targetRef || editorDisabled && !isInViewMode) {
+  const isEditorDisabled = editorDisabledState && editorDisabledState.editorDisabled;
+  const isInViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
+  if (!targetRef || isEditorDisabled && !isInViewMode) {
     return null;
   }
 

package/dist/es2019/ui/Toolbar.js

@@ -654,7 +654,7 @@ class Toolbar extends Component {
       handleEscape: this.handleEscape,
       disableArrowKeyNavigation: !this.shouldHandleArrowKeys(),
       childComponentSelector: "[data-testid='editor-floating-toolbar']",
-      isShortcutToFocusToolbar: fg('platform_editor_toolbar_rerender_optimization') ? this.isShortcutToFocusToolbar : isShortcutToFocusToolbar,
+      isShortcutToFocusToolbar: editorExperiment('platform_editor_toolbar_rerender_optimization_exp', true) ? this.isShortcutToFocusToolbar : isShortcutToFocusToolbar,
       intl: intl
     }, jsx("div", {
       ref: this.toolbarContainerRef,

package/dist/esm/floatingToolbarPlugin.js

@@ -7,11 +7,12 @@ 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 {
+// Deprecated API - Look at removing this sometime in the future
+useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -203,56 +204,6 @@ export var floatingToolbarPlugin = function floatingToolbarPlugin(_ref) {
     }
   };
 };
-var useSharedState = sharedPluginStateHookMigratorFactory(function (pluginInjectionApi) {
-  // floatingToolbar
-  var configWithNodeInfo = useSharedPluginStateSelector(pluginInjectionApi, 'floatingToolbar.configWithNodeInfo');
-  var floatingToolbarData = useSharedPluginStateSelector(pluginInjectionApi, 'floatingToolbar.floatingToolbarData');
-
-  // editorDisabled
-  var editorDisabledState = useSharedPluginStateSelector(pluginInjectionApi, 'editorDisabled.editorDisabled');
-
-  // editorViewMode
-  var mode = useSharedPluginStateSelector(pluginInjectionApi, 'editorViewMode.mode');
-
-  // userIntent
-  var currentUserIntent = useSharedPluginStateSelector(pluginInjectionApi, 'userIntent.currentUserIntent');
-
-  // blockControls
-  var isDragging = useSharedPluginStateSelector(pluginInjectionApi,
-  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-  'blockControls.isDragging');
-  // isMenuOpen
-  var isMenuOpen = useSharedPluginStateSelector(pluginInjectionApi,
-  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-  'blockControls.isMenuOpen');
-  return {
-    configWithNodeInfo: configWithNodeInfo,
-    floatingToolbarData: floatingToolbarData,
-    editorDisabled: editorDisabledState,
-    mode: mode,
-    currentUserIntent: currentUserIntent,
-    isDragging: isDragging,
-    isMenuOpen: isMenuOpen
-  };
-}, function (pluginInjectionApi) {
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
-    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-    'blockControls']),
-    floatingToolbarState = _useSharedPluginState.floatingToolbarState,
-    editorDisabledState = _useSharedPluginState.editorDisabledState,
-    editorViewModeState = _useSharedPluginState.editorViewModeState,
-    userIntentState = _useSharedPluginState.userIntentState,
-    blockControlsState = _useSharedPluginState.blockControlsState;
-  return {
-    configWithNodeInfo: floatingToolbarState === null || floatingToolbarState === void 0 ? void 0 : floatingToolbarState.configWithNodeInfo,
-    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,
-    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
-  };
-});
 export function ContentComponent(_ref5) {
   var _configWithNodeInfo$c, _configWithNodeInfo$c2, _items, _pluginInjectionApi$c, _pluginInjectionApi$d;
   var pluginInjectionApi = _ref5.pluginInjectionApi,
@@ -262,24 +213,27 @@ export function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedState = useSharedState(pluginInjectionApi),
-    configWithNodeInfo = _useSharedState.configWithNodeInfo,
-    currentUserIntent = _useSharedState.currentUserIntent,
-    editorDisabled = _useSharedState.editorDisabled,
-    floatingToolbarData = _useSharedState.floatingToolbarData,
-    isDragging = _useSharedState.isDragging,
-    isMenuOpen = _useSharedState.isMenuOpen,
-    mode = _useSharedState.mode;
-  if (isSSR() && editorExperiment('platform_editor_hide_floating_toolbar_in_ssr', true, {
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
+    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
+    'blockControls']),
+    floatingToolbarState = _useSharedPluginState.floatingToolbarState,
+    editorDisabledState = _useSharedPluginState.editorDisabledState,
+    editorViewModeState = _useSharedPluginState.editorViewModeState,
+    userIntentState = _useSharedPluginState.userIntentState,
+    blockControlsState = _useSharedPluginState.blockControlsState;
+  var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
+    configWithNodeInfo = _ref6.configWithNodeInfo,
+    floatingToolbarData = _ref6.floatingToolbarData;
+  if (editorExperiment('platform_editor_hide_floating_toolbar_in_ssr', true, {
     exposure: true
-  })) {
+  }) && isSSR()) {
     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;
   }
   if (fg('platform_editor_user_intent_plugin')) {
-    if (currentUserIntent === 'dragging') {
+    if ((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging') {
       return null;
     }
 
@@ -288,10 +242,10 @@ export function ContentComponent(_ref5) {
     // 	return null;
     // }
   } else {
-    if (isDragging) {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
       return null;
     }
-    if (isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
+    if (blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isMenuOpen && editorExperiment('platform_editor_controls', 'variant1')) {
       return null;
     }
   }
@@ -327,8 +281,9 @@ export function ContentComponent(_ref5) {
     _config$stick = config.stick,
     stick = _config$stick === void 0 ? true : _config$stick;
   var targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
-  var isInViewMode = mode === 'view';
-  if (!targetRef || editorDisabled && !isInViewMode) {
+  var isEditorDisabled = editorDisabledState && editorDisabledState.editorDisabled;
+  var isInViewMode = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
+  if (!targetRef || isEditorDisabled && !isInViewMode) {
     return null;
   }
 
@@ -381,8 +336,8 @@ export function ContentComponent(_ref5) {
   };
 
   // Confirm dialog
-  var _ref6 = floatingToolbarData || {},
-    confirmDialogForItem = _ref6.confirmDialogForItem;
+  var _ref7 = floatingToolbarData || {},
+    confirmDialogForItem = _ref7.confirmDialogForItem;
   var confirmButtonItem = confirmDialogForItem ?
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/dist/esm/ui/Toolbar.js

@@ -696,7 +696,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         handleEscape: this.handleEscape,
         disableArrowKeyNavigation: !this.shouldHandleArrowKeys(),
         childComponentSelector: "[data-testid='editor-floating-toolbar']",
-        isShortcutToFocusToolbar: fg('platform_editor_toolbar_rerender_optimization') ? this.isShortcutToFocusToolbar : isShortcutToFocusToolbar,
+        isShortcutToFocusToolbar: editorExperiment('platform_editor_toolbar_rerender_optimization_exp', true) ? 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.13",
+	"version": "4.1.15",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/adf-utils": "^19.20.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/checkbox": "^17.1.0",
-		"@atlaskit/editor-common": "^106.0.0",
+		"@atlaskit/editor-common": "^106.1.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-context-panel": "^4.1.0",
@@ -37,8 +37,8 @@
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.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-extension": "^5.5.0",
+		"@atlaskit/editor-plugin-interaction": "^2.0.0",
 		"@atlaskit/editor-plugin-table": "^10.11.0",
 		"@atlaskit/editor-plugin-user-intent": "^0.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -50,8 +50,8 @@
 		"@atlaskit/primitives": "^14.8.0",
 		"@atlaskit/select": "^20.6.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^5.2.0",
-		"@atlaskit/tokens": "^4.9.0",
+		"@atlaskit/tmp-editor-statsig": "^5.7.0",
+		"@atlaskit/tokens": "^5.0.0",
 		"@atlaskit/tooltip": "^20.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -154,9 +154,6 @@
 		},
 		"platform_editor_interaction_api_refactor": {
 			"type": "boolean"
-		},
-		"platform_editor_toolbar_rerender_optimization": {
-			"type": "boolean"
 		}
 	}
 }