@atlaskit/editor-plugin-floating-toolbar 4.0.0 → 4.0.3

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 4.0.3
+
+### Patch Changes
+
+- [#142352](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/142352)
+  [`05903fde6d94d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/05903fde6d94d) -
+  Internal change to use Compiled variant of `@atlaskit/primitives`.
+- [#141455](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141455)
+  [`8a8bd624345b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8a8bd624345b5) -
+  [ED-27542] Clean up platform_editor_controls_patch_2 used for floating toolbar scroll left/right
+  buttons
+- Updated dependencies
+
+## 4.0.2
+
+### Patch Changes
+
+- [#143960](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/143960)
+  [`e1bf8964b3cf8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e1bf8964b3cf8) -
+  Adding press interaction performance tracking to Comment action in floating toolbar. No UI change.
+- Updated dependencies
+
+## 4.0.1
+
+### Patch Changes
+
+- [#140969](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/140969)
+  [`b4ac22e73d43c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b4ac22e73d43c) -
+  [ux] [ED-27253] hide selection states until editor has been interacted with
+- Updated dependencies
+
 ## 4.0.0
 
 ### Major Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -174,11 +174,19 @@ var floatingToolbarPlugin = exports.floatingToolbarPlugin = function floatingToo
       }
     },
     getSharedState: function getSharedState(editorState) {
-      var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
+      var _api$interaction;
       if (!editorState) {
         return undefined;
       }
-      var configWithNodeInfo = (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 || (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined;
+      var hasHadInteraction = api === null || api === void 0 || (_api$interaction = api.interaction) === null || _api$interaction === void 0 || (_api$interaction = _api$interaction.sharedState.currentState()) === null || _api$interaction === void 0 ? void 0 : _api$interaction.hasHadInteraction;
+      var configWithNodeInfo;
+      if ((0, _platformFeatureFlags.fg)('platform_editor_no_selection_until_interaction')) {
+        var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
+        configWithNodeInfo = hasHadInteraction !== false ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 || (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
+      } else {
+        var _pluginKey$getState$g3, _pluginKey$getState2, _pluginKey$getState2$;
+        configWithNodeInfo = (_pluginKey$getState$g3 = (_pluginKey$getState2 = pluginKey.getState(editorState)) === null || _pluginKey$getState2 === void 0 || (_pluginKey$getState2$ = _pluginKey$getState2.getConfigWithNodeInfo) === null || _pluginKey$getState2$ === void 0 ? void 0 : _pluginKey$getState2$.call(_pluginKey$getState2, editorState)) !== null && _pluginKey$getState$g3 !== void 0 ? _pluginKey$getState$g3 : undefined;
+      }
       return {
         configWithNodeInfo: configWithNodeInfo,
         floatingToolbarData: _pluginKey.pluginKey.getState(editorState)

package/dist/cjs/ui/CheckboxModal.js

@@ -13,7 +13,7 @@ var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _checkbox = require("@atlaskit/checkbox");
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
-var _primitives = require("@atlaskit/primitives");
+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; }
 var CheckboxModal = exports.CheckboxModal = function CheckboxModal(props) {
@@ -64,11 +64,11 @@ var CheckboxModal = exports.CheckboxModal = function CheckboxModal(props) {
     testId: testId
   }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, {
     appearance: "warning"
-  }, heading)), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement(_primitives.Text, {
+  }, heading)), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement(_compiled.Text, {
     as: "p"
   }, options === null || options === void 0 ? void 0 : options.message), !!(childrenInfo !== null && childrenInfo !== void 0 && childrenInfo.length) && /*#__PURE__*/_react.default.createElement(ListComponent, {
     nodes: childrenInfo
-  }), /*#__PURE__*/_react.default.createElement(_primitives.Text, {
+  }), /*#__PURE__*/_react.default.createElement(_compiled.Text, {
     as: "p"
   }, /*#__PURE__*/_react.default.createElement(_checkbox.Checkbox, {
     isChecked: isChecked,

package/dist/cjs/ui/ExpandButton.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.ExpandButton = ExpandButton;
 var _react = _interopRequireDefault(require("react"));
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/utility/chevron-right"));
-var _primitives = require("@atlaskit/primitives");
+var _compiled = require("@atlaskit/primitives/compiled");
 function ExpandButton() {
-  return /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+  return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
     paddingInline: "space.075"
   }, /*#__PURE__*/_react.default.createElement(_chevronRight.default, {
     label: 'Edit'

package/dist/cjs/ui/SimpleModal.js

@@ -10,7 +10,7 @@ var _react = _interopRequireDefault(require("react"));
 var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
-var _primitives = require("@atlaskit/primitives");
+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; }
 var SimpleModal = exports.SimpleModal = function SimpleModal(props) {
@@ -27,7 +27,7 @@ var SimpleModal = exports.SimpleModal = function SimpleModal(props) {
     testId: testId
   }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, {
     appearance: "warning"
-  }, heading)), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement(_primitives.Text, {
+  }, heading)), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement(_compiled.Text, {
     as: "p"
   }, options === null || options === void 0 ? void 0 : options.message)), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_new.default, {
     appearance: "default",

package/dist/cjs/ui/Toolbar.js

@@ -166,7 +166,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           tabIndex: item.tabIndex,
           isRadioButton: item.isRadioButton,
           pulse: item.pulse,
-          spotlightConfig: item.spotlightConfig
+          spotlightConfig: item.spotlightConfig,
+          interactionName: item.interactionName
         }, item.showTitle && item.title);
       case 'input':
         return (0, _react2.jsx)(_Input.Input, {
@@ -650,7 +651,6 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         scrollable = _this$props2.scrollable,
         mediaAssistiveMessage = _this$props2.mediaAssistiveMessage;
       var isEditorControlsEnabled = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1');
-      var isEditorControlsPatch2Enabled = isEditorControlsEnabled && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2');
       if (!items || !items.length) {
         return null;
       }
@@ -686,7 +686,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       }, (0, _react2.jsx)(_ui.Announcer, {
         text: mediaAssistiveMessage ? "".concat(mediaAssistiveMessage, ", ").concat(intl.formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer)) : intl.formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer),
         delay: 250
-      }), scrollable && isEditorControlsPatch2Enabled && (0, _react2.jsx)(_ScrollButton.ScrollButton, {
+      }), scrollable && isEditorControlsEnabled && (0, _react2.jsx)(_ScrollButton.ScrollButton, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,
         node: node,
@@ -711,7 +711,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         setDisableScroll: this.setDisableScroll.bind(this),
         mountRef: this.mountRef,
         mounted: this.state.mounted
-      }))), scrollable && (isEditorControlsPatch2Enabled ? (0, _react2.jsx)(_ScrollButton.ScrollButton, {
+      }))), scrollable && (isEditorControlsEnabled ? (0, _react2.jsx)(_ScrollButton.ScrollButton, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,
         node: node,

package/dist/es2019/floatingToolbarPlugin.js

@@ -154,11 +154,19 @@ export const floatingToolbarPlugin = ({
       copyNode: nodeType => copyNode(nodeType)
     },
     getSharedState(editorState) {
-      var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
+      var _api$interaction, _api$interaction$shar;
       if (!editorState) {
         return undefined;
       }
-      const configWithNodeInfo = (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 ? void 0 : (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined;
+      const hasHadInteraction = api === null || api === void 0 ? void 0 : (_api$interaction = api.interaction) === null || _api$interaction === void 0 ? void 0 : (_api$interaction$shar = _api$interaction.sharedState.currentState()) === null || _api$interaction$shar === void 0 ? void 0 : _api$interaction$shar.hasHadInteraction;
+      let configWithNodeInfo;
+      if (fg('platform_editor_no_selection_until_interaction')) {
+        var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
+        configWithNodeInfo = hasHadInteraction !== false ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 ? void 0 : (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
+      } else {
+        var _pluginKey$getState$g3, _pluginKey$getState2, _pluginKey$getState2$;
+        configWithNodeInfo = (_pluginKey$getState$g3 = (_pluginKey$getState2 = pluginKey.getState(editorState)) === null || _pluginKey$getState2 === void 0 ? void 0 : (_pluginKey$getState2$ = _pluginKey$getState2.getConfigWithNodeInfo) === null || _pluginKey$getState2$ === void 0 ? void 0 : _pluginKey$getState2$.call(_pluginKey$getState2, editorState)) !== null && _pluginKey$getState$g3 !== void 0 ? _pluginKey$getState$g3 : undefined;
+      }
       return {
         configWithNodeInfo,
         floatingToolbarData: dataPluginKey.getState(editorState)

package/dist/es2019/ui/CheckboxModal.js

@@ -4,7 +4,7 @@ import Button from '@atlaskit/button/new';
 import { Checkbox } from '@atlaskit/checkbox';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { Text } from '@atlaskit/primitives';
+import { Text } from '@atlaskit/primitives/compiled';
 export const CheckboxModal = props => {
   var _options$getChildrenI;
   const [isChecked, setCheckbox] = useState(false);

package/dist/es2019/ui/ExpandButton.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Icon from '@atlaskit/icon/utility/chevron-right';
-import { Box } from '@atlaskit/primitives';
+import { Box } from '@atlaskit/primitives/compiled';
 export function ExpandButton() {
   return /*#__PURE__*/React.createElement(Box, {
     paddingInline: "space.075"

package/dist/es2019/ui/SimpleModal.js

@@ -2,7 +2,7 @@ import React from 'react';
 import Button from '@atlaskit/button/new';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { Text } from '@atlaskit/primitives';
+import { Text } from '@atlaskit/primitives/compiled';
 export const SimpleModal = props => {
   const {
     onConfirm,

package/dist/es2019/ui/Toolbar.js

@@ -147,7 +147,8 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           tabIndex: item.tabIndex,
           isRadioButton: item.isRadioButton,
           pulse: item.pulse,
-          spotlightConfig: item.spotlightConfig
+          spotlightConfig: item.spotlightConfig,
+          interactionName: item.interactionName
         }, item.showTitle && item.title);
       case 'input':
         return jsx(Input, {
@@ -604,7 +605,6 @@ class Toolbar extends Component {
       mediaAssistiveMessage
     } = this.props;
     const isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
-    const isEditorControlsPatch2Enabled = isEditorControlsEnabled && fg('platform_editor_controls_patch_2');
     if (!items || !items.length) {
       return null;
     }
@@ -636,7 +636,7 @@ class Toolbar extends Component {
     }, jsx(Announcer, {
       text: mediaAssistiveMessage ? `${mediaAssistiveMessage}, ${intl.formatMessage(messages.floatingToolbarAnnouncer)}` : intl.formatMessage(messages.floatingToolbarAnnouncer),
       delay: 250
-    }), scrollable && isEditorControlsPatch2Enabled && jsx(ScrollButton, {
+    }), scrollable && isEditorControlsEnabled && jsx(ScrollButton, {
       intl: intl,
       scrollContainerRef: this.scrollContainerRef,
       node: node,
@@ -661,7 +661,7 @@ class Toolbar extends Component {
       setDisableScroll: this.setDisableScroll.bind(this),
       mountRef: this.mountRef,
       mounted: this.state.mounted
-    }))), scrollable && (isEditorControlsPatch2Enabled ? jsx(ScrollButton, {
+    }))), scrollable && (isEditorControlsEnabled ? jsx(ScrollButton, {
       intl: intl,
       scrollContainerRef: this.scrollContainerRef,
       node: node,

package/dist/esm/floatingToolbarPlugin.js

@@ -162,11 +162,19 @@ export var floatingToolbarPlugin = function floatingToolbarPlugin(_ref) {
       }
     },
     getSharedState: function getSharedState(editorState) {
-      var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
+      var _api$interaction;
       if (!editorState) {
         return undefined;
       }
-      var configWithNodeInfo = (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 || (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined;
+      var hasHadInteraction = api === null || api === void 0 || (_api$interaction = api.interaction) === null || _api$interaction === void 0 || (_api$interaction = _api$interaction.sharedState.currentState()) === null || _api$interaction === void 0 ? void 0 : _api$interaction.hasHadInteraction;
+      var configWithNodeInfo;
+      if (fg('platform_editor_no_selection_until_interaction')) {
+        var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
+        configWithNodeInfo = hasHadInteraction !== false ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 || (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
+      } else {
+        var _pluginKey$getState$g3, _pluginKey$getState2, _pluginKey$getState2$;
+        configWithNodeInfo = (_pluginKey$getState$g3 = (_pluginKey$getState2 = pluginKey.getState(editorState)) === null || _pluginKey$getState2 === void 0 || (_pluginKey$getState2$ = _pluginKey$getState2.getConfigWithNodeInfo) === null || _pluginKey$getState2$ === void 0 ? void 0 : _pluginKey$getState2$.call(_pluginKey$getState2, editorState)) !== null && _pluginKey$getState$g3 !== void 0 ? _pluginKey$getState$g3 : undefined;
+      }
       return {
         configWithNodeInfo: configWithNodeInfo,
         floatingToolbarData: dataPluginKey.getState(editorState)

package/dist/esm/ui/CheckboxModal.js

@@ -5,7 +5,7 @@ import Button from '@atlaskit/button/new';
 import { Checkbox } from '@atlaskit/checkbox';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { Text } from '@atlaskit/primitives';
+import { Text } from '@atlaskit/primitives/compiled';
 export var CheckboxModal = function CheckboxModal(props) {
   var _options$getChildrenI;
   var _useState = useState(false),

package/dist/esm/ui/ExpandButton.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Icon from '@atlaskit/icon/utility/chevron-right';
-import { Box } from '@atlaskit/primitives';
+import { Box } from '@atlaskit/primitives/compiled';
 export function ExpandButton() {
   return /*#__PURE__*/React.createElement(Box, {
     paddingInline: "space.075"

package/dist/esm/ui/SimpleModal.js

@@ -2,7 +2,7 @@ import React from 'react';
 import Button from '@atlaskit/button/new';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { Text } from '@atlaskit/primitives';
+import { Text } from '@atlaskit/primitives/compiled';
 export var SimpleModal = function SimpleModal(props) {
   var onConfirm = props.onConfirm,
     onClose = props.onClose,

package/dist/esm/ui/Toolbar.js

@@ -159,7 +159,8 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           tabIndex: item.tabIndex,
           isRadioButton: item.isRadioButton,
           pulse: item.pulse,
-          spotlightConfig: item.spotlightConfig
+          spotlightConfig: item.spotlightConfig,
+          interactionName: item.interactionName
         }, item.showTitle && item.title);
       case 'input':
         return jsx(Input, {
@@ -643,7 +644,6 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         scrollable = _this$props2.scrollable,
         mediaAssistiveMessage = _this$props2.mediaAssistiveMessage;
       var isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
-      var isEditorControlsPatch2Enabled = isEditorControlsEnabled && fg('platform_editor_controls_patch_2');
       if (!items || !items.length) {
         return null;
       }
@@ -679,7 +679,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       }, jsx(Announcer, {
         text: mediaAssistiveMessage ? "".concat(mediaAssistiveMessage, ", ").concat(intl.formatMessage(messages.floatingToolbarAnnouncer)) : intl.formatMessage(messages.floatingToolbarAnnouncer),
         delay: 250
-      }), scrollable && isEditorControlsPatch2Enabled && jsx(ScrollButton, {
+      }), scrollable && isEditorControlsEnabled && jsx(ScrollButton, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,
         node: node,
@@ -704,7 +704,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         setDisableScroll: this.setDisableScroll.bind(this),
         mountRef: this.mountRef,
         mounted: this.state.mounted
-      }))), scrollable && (isEditorControlsPatch2Enabled ? jsx(ScrollButton, {
+      }))), scrollable && (isEditorControlsEnabled ? jsx(ScrollButton, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,
         node: node,

package/dist/types/floatingToolbarPluginType.d.ts

@@ -7,6 +7,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { EmojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
@@ -35,7 +36,8 @@ export type FloatingToolbarPluginDependencies = [
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<FeatureFlagsPlugin>,
     OptionalPlugin<EmojiPlugin>,
-    OptionalPlugin<UserIntentPlugin>
+    OptionalPlugin<UserIntentPlugin>,
+    OptionalPlugin<InteractionPlugin>
 ];
 export type FloatingToolbarPlugin = NextEditorPlugin<'floatingToolbar', {
     dependencies: FloatingToolbarPluginDependencies;

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

@@ -7,6 +7,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { EmojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
@@ -35,7 +36,8 @@ export type FloatingToolbarPluginDependencies = [
     OptionalPlugin<EditorViewModePlugin>,
     OptionalPlugin<FeatureFlagsPlugin>,
     OptionalPlugin<EmojiPlugin>,
-    OptionalPlugin<UserIntentPlugin>
+    OptionalPlugin<UserIntentPlugin>,
+    OptionalPlugin<InteractionPlugin>
 ];
 export type FloatingToolbarPlugin = NextEditorPlugin<'floatingToolbar', {
     dependencies: FloatingToolbarPluginDependencies;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "4.0.0",
+	"version": "4.0.3",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/adf-utils": "^19.19.0",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/checkbox": "^17.0.0",
-		"@atlaskit/editor-common": "^103.11.0",
+		"@atlaskit/editor-common": "^103.12.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-context-panel": "^4.0.0",
 		"@atlaskit/editor-plugin-copy-button": "^2.0.0",
@@ -37,6 +37,7 @@
 		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
 		"@atlaskit/editor-plugin-emoji": "^3.6.0",
 		"@atlaskit/editor-plugin-extension": "^5.2.0",
+		"@atlaskit/editor-plugin-interaction": "^1.0.0",
 		"@atlaskit/editor-plugin-table": "^10.8.0",
 		"@atlaskit/editor-plugin-user-intent": "^0.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -132,10 +133,10 @@
 		"platform_editor_fix_floating_toolbar_scrollbar": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_2": {
+		"platform_editor_controls_patch_4": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_4": {
+		"platform_editor_no_selection_until_interaction": {
 			"type": "boolean"
 		},
 		"platform_editor_user_intent_plugin": {