@atlaskit/editor-plugin-toolbar 2.1.3 → 2.1.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 2.1.5
+
+### Patch Changes
+
+- [`bb498825fca37`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bb498825fca37) -
+  [ux] [ED-29266] add ToolbarKeyboardNavigationProvider to selection toolbar with Alt+F10 shortcut
+  to focus
+- Updated dependencies
+
+## 2.1.4
+
+### Patch Changes
+
+- [`e24c73c66f022`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e24c73c66f022) -
+  [ux] ED-29268 [SoftServ] Toolbar doesn’t move with text when text alignment change
+- Updated dependencies
+
 ## 2.1.3
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../../helpers/browser-apis/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-analytics/afm-cc/tsconfig.json"
 		},

package/afm-dev-agents/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../editor-plugin-analytics/afm-dev-agents/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-connectivity/afm-dev-agents/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../editor-plugin-analytics/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-connectivity/afm-jira/tsconfig.json"
 		},

package/afm-passionfruit/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../editor-plugin-analytics/afm-passionfruit/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-connectivity/afm-passionfruit/tsconfig.json"
 		},

package/afm-post-office/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../editor-plugin-analytics/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-connectivity/afm-post-office/tsconfig.json"
 		},

package/afm-rovo-extension/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../editor-plugin-analytics/afm-rovo-extension/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-connectivity/afm-rovo-extension/tsconfig.json"
 		},

package/afm-townsquare/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../editor-plugin-analytics/afm-townsquare/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-connectivity/afm-townsquare/tsconfig.json"
 		},

package/dist/cjs/toolbarPlugin.js

@@ -9,7 +9,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _bindEventListener = require("bind-event-listener");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorToolbarModel = require("@atlaskit/editor-toolbar-model");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _consts = require("./ui/consts");
 var _SelectionToolbar = require("./ui/SelectionToolbar");
@@ -17,6 +20,51 @@ var _toolbarComponents = require("./ui/toolbar-components");
 var _toolbar = require("./ui/utils/toolbar");
 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 getSelectedNode(editorState) {
+  var selection = editorState.selection;
+  if (selection instanceof _state.NodeSelection) {
+    return {
+      node: selection.node,
+      pos: selection.from,
+      nodeType: selection.node.type.name,
+      marks: selection.node.marks.map(function (mark) {
+        return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
+      })
+    };
+  }
+  var nodes = editorState.schema.nodes;
+  var selectedNode = (0, _utils.findSelectedNodeOfType)([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock])(selection);
+  if (selectedNode) {
+    return {
+      node: selectedNode.node,
+      pos: selectedNode.pos,
+      nodeType: selectedNode.node.type.name,
+      marks: selectedNode.node.marks.map(function (mark) {
+        return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
+      })
+    };
+  }
+  var parentNode = (0, _utils.findParentNodeOfType)([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.listItem, nodes.taskItem])(selection);
+  if (parentNode) {
+    return {
+      node: parentNode.node,
+      pos: parentNode.pos,
+      nodeType: parentNode.node.type.name,
+      marks: parentNode.node.marks.map(function (mark) {
+        return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
+      })
+    };
+  }
+  var $pos = selection.$from;
+  return {
+    node: $pos.parent,
+    pos: $pos.pos,
+    nodeType: $pos.parent.type.name,
+    marks: $pos.marks().map(function (mark) {
+      return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
+    })
+  };
+}
 var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
   var api = _ref.api,
     _ref$config = _ref.config,
@@ -57,16 +105,28 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
           return new _safePlugin.SafePlugin({
             key: _pluginKey.editorToolbarPluginKey,
             state: {
-              init: function init() {
+              init: function init(_, editorState) {
                 return {
-                  shouldShowToolbar: false
+                  shouldShowToolbar: false,
+                  selectedNode: getSelectedNode(editorState)
                 };
               },
-              apply: function apply(tr, pluginState) {
+              apply: function apply(tr, pluginState, _, newState) {
                 var meta = tr.getMeta(_pluginKey.editorToolbarPluginKey);
-                var newPluginState = pluginState;
+                var newPluginState = _objectSpread({}, pluginState);
+                if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true)) {
+                  var shouldUpdateNode = tr.docChanged || tr.selectionSet;
+                  if (shouldUpdateNode) {
+                    var newSelectedNode = getSelectedNode(newState);
+                    var oldNode = pluginState.selectedNode;
+                    var hasNodeChanged = !oldNode || !newSelectedNode || oldNode.nodeType !== newSelectedNode.nodeType || oldNode.pos !== newSelectedNode.pos || JSON.stringify(oldNode.marks) !== JSON.stringify(newSelectedNode.marks);
+                    if (hasNodeChanged) {
+                      newPluginState.selectedNode = newSelectedNode;
+                    }
+                  }
+                }
                 if (meta) {
-                  return _objectSpread(_objectSpread({}, newPluginState), meta);
+                  newPluginState = _objectSpread(_objectSpread({}, newPluginState), meta);
                 }
                 return newPluginState;
               }

package/dist/cjs/ui/SelectionToolbar/index.js

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SelectionToolbar = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _browserApis = require("@atlaskit/browser-apis");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _ui = require("@atlaskit/editor-common/ui");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
@@ -20,6 +23,7 @@ var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _consts = require("../consts");
+var _toolbar2 = require("../utils/toolbar");
 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 isToolbarComponent = function isToolbarComponent(component) {
   return component.type === 'toolbar' && component.key === 'inline-text-toolbar';
@@ -28,11 +32,12 @@ var usePluginState = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(fun
   return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
 }, function (api) {
   return (0, _hooks.useSharedPluginStateWithSelector)(api, ['connectivity', 'userPreferences', 'toolbar', 'selection', 'userIntent', 'editorViewMode'], function (state) {
-    var _state$connectivitySt, _state$userPreference, _state$toolbarState, _state$selectionState, _state$userIntentStat, _state$editorViewMode;
+    var _state$connectivitySt, _state$userPreference, _state$toolbarState, _state$toolbarState2, _state$selectionState, _state$userIntentStat, _state$editorViewMode;
     return {
       connectivityStateMode: (_state$connectivitySt = state.connectivityState) === null || _state$connectivitySt === void 0 ? void 0 : _state$connectivitySt.mode,
       editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 || (_state$userPreference = _state$userPreference.preferences) === null || _state$userPreference === void 0 ? void 0 : _state$userPreference.toolbarDockingPosition,
       shouldShowToolbar: (_state$toolbarState = state.toolbarState) === null || _state$toolbarState === void 0 ? void 0 : _state$toolbarState.shouldShowToolbar,
+      selectedNode: (_state$toolbarState2 = state.toolbarState) === null || _state$toolbarState2 === void 0 ? void 0 : _state$toolbarState2.selectedNode,
       selection: (_state$selectionState = state.selectionState) === null || _state$selectionState === void 0 ? void 0 : _state$selectionState.selection,
       currentUserIntent: (_state$userIntentStat = state.userIntentState) === null || _state$userIntentStat === void 0 ? void 0 : _state$userIntentStat.currentUserIntent,
       editorViewMode: (_state$editorViewMode = state.editorViewModeState) === null || _state$editorViewMode === void 0 ? void 0 : _state$editorViewMode.mode
@@ -44,19 +49,22 @@ var usePluginState = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(fun
   var currentUserIntent = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'userIntent.currentUserIntent');
   var selection = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'selection.selection');
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['toolbar'], function (state) {
-      var _state$toolbarState2;
+      var _state$toolbarState3, _state$toolbarState4;
       return {
-        shouldShowToolbar: (_state$toolbarState2 = state.toolbarState) === null || _state$toolbarState2 === void 0 ? void 0 : _state$toolbarState2.shouldShowToolbar
+        shouldShowToolbar: (_state$toolbarState3 = state.toolbarState) === null || _state$toolbarState3 === void 0 ? void 0 : _state$toolbarState3.shouldShowToolbar,
+        selectedNode: (_state$toolbarState4 = state.toolbarState) === null || _state$toolbarState4 === void 0 ? void 0 : _state$toolbarState4.selectedNode
       };
     }),
-    shouldShowToolbar = _useSharedPluginState.shouldShowToolbar;
+    shouldShowToolbar = _useSharedPluginState.shouldShowToolbar,
+    selectedNode = _useSharedPluginState.selectedNode;
   return {
     connectivityStateMode: connectivityStateMode,
     editorToolbarDockingPreference: editorToolbarDockingPreference,
     currentUserIntent: currentUserIntent,
     shouldShowToolbar: shouldShowToolbar,
     selection: selection,
-    editorViewMode: undefined
+    editorViewMode: undefined,
+    selectedNode: selectedNode
   };
 });
 var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref) {
@@ -72,10 +80,14 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
     shouldShowToolbar = _usePluginState.shouldShowToolbar,
     editorViewMode = _usePluginState.editorViewMode,
     selection = _usePluginState.selection;
+  var intl = (0, _reactIntlNext.useIntl)();
   var components = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.getComponents();
   var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
     return isToolbarComponent(component);
   });
+  var keyboardNavigation = (0, _react.useMemo)(function () {
+    return getKeyboardNavigationConfig(editorView, intl, api);
+  }, [editorView, intl, api]);
   var isOffline = connectivityStateMode === 'offline';
   var isTextSelection = !editorView.state.selection.empty && editorView.state.selection instanceof _state.TextSelection;
   var isAllSelection = !editorView.state.selection.empty && editorView.state.selection instanceof _state.AllSelection && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true);
@@ -89,8 +101,7 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
     if (isCellSelection && isEditorControlsEnabled) {
       return (0, _utils.calculateToolbarPositionOnCellSelection)(toolbarTitle)(editorView, position);
     }
-    var calc = _utils.calculateToolbarPositionTrackHead;
-    return calc(toolbarTitle)(editorView, position);
+    return (0, _utils.calculateToolbarPositionTrackHead)(toolbarTitle)(editorView, position);
   }, [editorView]);
   if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && editorToolbarDockingPreference === 'top' && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
@@ -115,7 +126,8 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
     fireAnalyticsEvent: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_toolbar_analytic', 'isEnabled', true) ? function (payload) {
       var _api$analytics;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent(payload);
-    } : undefined
+    } : undefined,
+    keyboardNavigation: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? keyboardNavigation : undefined
   }, /*#__PURE__*/_react.default.createElement(_editorToolbarModel.ToolbarModelRenderer, {
     toolbar: toolbar,
     components: components,
@@ -157,4 +169,47 @@ var getDomRefFromSelection = function getDomRefFromSelection(view
     // 	dispatchAnalyticsEvent(payload);
     // }
   }
+};
+var getKeyboardNavigationConfig = function getKeyboardNavigationConfig(editorView, intl, api) {
+  if (!(editorView.dom instanceof HTMLElement)) {
+    return;
+  }
+  var toolbarSelector = "[data-testid='editor-floating-toolbar']";
+  return {
+    childComponentSelector: toolbarSelector,
+    dom: editorView.dom,
+    isShortcutToFocusToolbar: _toolbar2.isShortcutToFocusToolbar,
+    handleFocus: function handleFocus(event) {
+      var _getDocument, _filteredFocusableEle, _filteredFocusableEle2, _filteredFocusableEle3;
+      var toolbar = (_getDocument = (0, _browserApis.getDocument)()) === null || _getDocument === void 0 ? void 0 : _getDocument.querySelector(toolbarSelector);
+      if (!(toolbar instanceof HTMLElement)) {
+        return;
+      }
+      var filteredFocusableElements = (0, _toolbar2.getFocusableElements)(toolbar);
+      (_filteredFocusableEle = filteredFocusableElements[0]) === null || _filteredFocusableEle === void 0 || _filteredFocusableEle.focus();
+
+      // the button element removes the focus ring so this class adds it back
+      if (((_filteredFocusableEle2 = filteredFocusableElements[0]) === null || _filteredFocusableEle2 === void 0 ? void 0 : _filteredFocusableEle2.tagName) === 'BUTTON') {
+        filteredFocusableElements[0].classList.add('first-floating-toolbar-button');
+      }
+      (_filteredFocusableEle3 = filteredFocusableElements[0]) === null || _filteredFocusableEle3 === void 0 || _filteredFocusableEle3.scrollIntoView({
+        behavior: 'smooth',
+        block: 'center',
+        inline: 'nearest'
+      });
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    handleEscape: function handleEscape(event) {
+      var isDropdownOpen = !!document.querySelector('[data-toolbar-component="menu-section"]');
+      if (isDropdownOpen) {
+        return;
+      }
+      api === null || api === void 0 || api.core.actions.focus();
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    ariaControls: _ui.EDIT_AREA_ID,
+    ariaLabel: intl.formatMessage(_messages.fullPageMessages.toolbarLabel)
+  };
 };

package/dist/cjs/ui/toolbar-components.js

@@ -25,7 +25,8 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       var children = _ref.children;
       return /*#__PURE__*/_react.default.createElement(_editorToolbar.Toolbar, {
         label: _consts.SELECTION_TOOLBAR_LABEL,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.SELECTION_TOOLBAR
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
+        testId: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? 'editor-floating-toolbar' : undefined
       }, children);
     }
   }, {

package/dist/cjs/ui/utils/toolbar.js

@@ -3,11 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isEventInContainer = void 0;
+exports.isShortcutToFocusToolbar = exports.isEventInContainer = exports.getFocusableElements = void 0;
 var isEventInContainer = exports.isEventInContainer = function isEventInContainer(event, containerSelector) {
   var target = event.target instanceof Element ? event.target : null;
   if (!target) {
     return false;
   }
   return !!target.closest(containerSelector);
+};
+var isShortcutToFocusToolbar = exports.isShortcutToFocusToolbar = function isShortcutToFocusToolbar(event) {
+  return event.altKey && event.key === 'F10';
+};
+var getFocusableElements = exports.getFocusableElements = function getFocusableElements(rootNode) {
+  if (!rootNode) {
+    return [];
+  }
+  var focusableElements = rootNode.querySelectorAll('a[href], button:not([disabled]), textarea, input, select, div[tabindex="-1"], div[tabindex="0"]') || [];
+  var focusableElementsArray = Array.from(focusableElements);
+
+  // filter out focusable elements from child components such as dropdown menus / popups
+  return focusableElementsArray.filter(function (elm) {
+    var style = window.getComputedStyle(elm);
+
+    // filter out invisible elements
+    return style.visibility !== 'hidden' && style.display !== 'none';
+  });
 };

package/dist/es2019/toolbarPlugin.js

@@ -1,12 +1,56 @@
 import React from 'react';
 import { bind } from 'bind-event-listener';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { findSelectedNodeOfType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createComponentRegistry } from '@atlaskit/editor-toolbar-model';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorToolbarPluginKey } from './pm-plugins/plugin-key';
 import { DEFAULT_POPUP_SELECTORS } from './ui/consts';
 import { SelectionToolbar } from './ui/SelectionToolbar';
 import { getToolbarComponents } from './ui/toolbar-components';
 import { isEventInContainer } from './ui/utils/toolbar';
+function getSelectedNode(editorState) {
+  const {
+    selection
+  } = editorState;
+  if (selection instanceof NodeSelection) {
+    return {
+      node: selection.node,
+      pos: selection.from,
+      nodeType: selection.node.type.name,
+      marks: selection.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
+    };
+  }
+  const {
+    nodes
+  } = editorState.schema;
+  const selectedNode = findSelectedNodeOfType([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock])(selection);
+  if (selectedNode) {
+    return {
+      node: selectedNode.node,
+      pos: selectedNode.pos,
+      nodeType: selectedNode.node.type.name,
+      marks: selectedNode.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
+    };
+  }
+  const parentNode = findParentNodeOfType([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.listItem, nodes.taskItem])(selection);
+  if (parentNode) {
+    return {
+      node: parentNode.node,
+      pos: parentNode.pos,
+      nodeType: parentNode.node.type.name,
+      marks: parentNode.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
+    };
+  }
+  const $pos = selection.$from;
+  return {
+    node: $pos.parent,
+    pos: $pos.pos,
+    nodeType: $pos.parent.type.name,
+    marks: $pos.marks().map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
+  };
+}
 export const toolbarPlugin = ({
   api,
   config = {
@@ -48,16 +92,30 @@ export const toolbarPlugin = ({
           return new SafePlugin({
             key: editorToolbarPluginKey,
             state: {
-              init() {
+              init(_, editorState) {
                 return {
-                  shouldShowToolbar: false
+                  shouldShowToolbar: false,
+                  selectedNode: getSelectedNode(editorState)
                 };
               },
-              apply(tr, pluginState) {
+              apply(tr, pluginState, _, newState) {
                 const meta = tr.getMeta(editorToolbarPluginKey);
-                const newPluginState = pluginState;
+                let newPluginState = {
+                  ...pluginState
+                };
+                if (expValEquals('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true)) {
+                  const shouldUpdateNode = tr.docChanged || tr.selectionSet;
+                  if (shouldUpdateNode) {
+                    const newSelectedNode = getSelectedNode(newState);
+                    const oldNode = pluginState.selectedNode;
+                    const hasNodeChanged = !oldNode || !newSelectedNode || oldNode.nodeType !== newSelectedNode.nodeType || oldNode.pos !== newSelectedNode.pos || JSON.stringify(oldNode.marks) !== JSON.stringify(newSelectedNode.marks);
+                    if (hasNodeChanged) {
+                      newPluginState.selectedNode = newSelectedNode;
+                    }
+                  }
+                }
                 if (meta) {
-                  return {
+                  newPluginState = {
                     ...newPluginState,
                     ...meta
                   };

package/dist/es2019/ui/SelectionToolbar/index.js

@@ -1,8 +1,11 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
+import { getDocument } from '@atlaskit/browser-apis';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { fullPageMessages } from '@atlaskit/editor-common/messages';
 import { EditorToolbarProvider, EditorToolbarUIProvider } from '@atlaskit/editor-common/toolbar';
-import { Popup } from '@atlaskit/editor-common/ui';
+import { Popup, EDIT_AREA_ID } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { calculateToolbarPositionTrackHead, calculateToolbarPositionOnCellSelection } from '@atlaskit/editor-common/utils';
 import { AllSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -13,16 +16,18 @@ import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react'
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { SELECTION_TOOLBAR_LABEL } from '../consts';
+import { getFocusableElements, isShortcutToFocusToolbar } from '../utils/toolbar';
 const isToolbarComponent = component => {
   return component.type === 'toolbar' && component.key === 'inline-text-toolbar';
 };
 const usePluginState = conditionalHooksFactory(() => expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true), api => {
   return useSharedPluginStateWithSelector(api, ['connectivity', 'userPreferences', 'toolbar', 'selection', 'userIntent', 'editorViewMode'], state => {
-    var _state$connectivitySt, _state$userPreference, _state$userPreference2, _state$toolbarState, _state$selectionState, _state$userIntentStat, _state$editorViewMode;
+    var _state$connectivitySt, _state$userPreference, _state$userPreference2, _state$toolbarState, _state$toolbarState2, _state$selectionState, _state$userIntentStat, _state$editorViewMode;
     return {
       connectivityStateMode: (_state$connectivitySt = state.connectivityState) === null || _state$connectivitySt === void 0 ? void 0 : _state$connectivitySt.mode,
       editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 ? void 0 : (_state$userPreference2 = _state$userPreference.preferences) === null || _state$userPreference2 === void 0 ? void 0 : _state$userPreference2.toolbarDockingPosition,
       shouldShowToolbar: (_state$toolbarState = state.toolbarState) === null || _state$toolbarState === void 0 ? void 0 : _state$toolbarState.shouldShowToolbar,
+      selectedNode: (_state$toolbarState2 = state.toolbarState) === null || _state$toolbarState2 === void 0 ? void 0 : _state$toolbarState2.selectedNode,
       selection: (_state$selectionState = state.selectionState) === null || _state$selectionState === void 0 ? void 0 : _state$selectionState.selection,
       currentUserIntent: (_state$userIntentStat = state.userIntentState) === null || _state$userIntentStat === void 0 ? void 0 : _state$userIntentStat.currentUserIntent,
       editorViewMode: (_state$editorViewMode = state.editorViewModeState) === null || _state$editorViewMode === void 0 ? void 0 : _state$editorViewMode.mode
@@ -34,11 +39,13 @@ const usePluginState = conditionalHooksFactory(() => expValEquals('platform_edit
   const currentUserIntent = useSharedPluginStateSelector(api, 'userIntent.currentUserIntent');
   const selection = useSharedPluginStateSelector(api, 'selection.selection');
   const {
-    shouldShowToolbar
+    shouldShowToolbar,
+    selectedNode
   } = useSharedPluginStateWithSelector(api, ['toolbar'], state => {
-    var _state$toolbarState2;
+    var _state$toolbarState3, _state$toolbarState4;
     return {
-      shouldShowToolbar: (_state$toolbarState2 = state.toolbarState) === null || _state$toolbarState2 === void 0 ? void 0 : _state$toolbarState2.shouldShowToolbar
+      shouldShowToolbar: (_state$toolbarState3 = state.toolbarState) === null || _state$toolbarState3 === void 0 ? void 0 : _state$toolbarState3.shouldShowToolbar,
+      selectedNode: (_state$toolbarState4 = state.toolbarState) === null || _state$toolbarState4 === void 0 ? void 0 : _state$toolbarState4.selectedNode
     };
   });
   return {
@@ -47,7 +54,8 @@ const usePluginState = conditionalHooksFactory(() => expValEquals('platform_edit
     currentUserIntent,
     shouldShowToolbar,
     selection,
-    editorViewMode: undefined
+    editorViewMode: undefined,
+    selectedNode
   };
 });
 export const SelectionToolbar = ({
@@ -66,8 +74,12 @@ export const SelectionToolbar = ({
     // @ts-expect-error
     selection
   } = usePluginState(api);
+  const intl = useIntl();
   const components = api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.getComponents();
   const toolbar = components === null || components === void 0 ? void 0 : components.find(component => isToolbarComponent(component));
+  const keyboardNavigation = useMemo(() => {
+    return getKeyboardNavigationConfig(editorView, intl, api);
+  }, [editorView, intl, api]);
   const isOffline = connectivityStateMode === 'offline';
   const isTextSelection = !editorView.state.selection.empty && editorView.state.selection instanceof TextSelection;
   const isAllSelection = !editorView.state.selection.empty && editorView.state.selection instanceof AllSelection && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true);
@@ -81,8 +93,7 @@ export const SelectionToolbar = ({
     if (isCellSelection && isEditorControlsEnabled) {
       return calculateToolbarPositionOnCellSelection(toolbarTitle)(editorView, position);
     }
-    const calc = calculateToolbarPositionTrackHead;
-    return calc(toolbarTitle)(editorView, position);
+    return calculateToolbarPositionTrackHead(toolbarTitle)(editorView, position);
   }, [editorView]);
   if (expValEquals('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && editorToolbarDockingPreference === 'top' && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
@@ -107,7 +118,8 @@ export const SelectionToolbar = ({
     fireAnalyticsEvent: expValEquals('platform_editor_toolbar_aifc_toolbar_analytic', 'isEnabled', true) ? payload => {
       var _api$analytics;
       api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.fireAnalyticsEvent(payload);
-    } : undefined
+    } : undefined,
+    keyboardNavigation: expValEquals('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? keyboardNavigation : undefined
   }, /*#__PURE__*/React.createElement(ToolbarModelRenderer, {
     toolbar: toolbar,
     components: components,
@@ -149,4 +161,47 @@ const getDomRefFromSelection = (view
     // 	dispatchAnalyticsEvent(payload);
     // }
   }
+};
+const getKeyboardNavigationConfig = (editorView, intl, api) => {
+  if (!(editorView.dom instanceof HTMLElement)) {
+    return;
+  }
+  const toolbarSelector = "[data-testid='editor-floating-toolbar']";
+  return {
+    childComponentSelector: toolbarSelector,
+    dom: editorView.dom,
+    isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+    handleFocus: event => {
+      var _getDocument, _filteredFocusableEle, _filteredFocusableEle2, _filteredFocusableEle3;
+      const toolbar = (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.querySelector(toolbarSelector);
+      if (!(toolbar instanceof HTMLElement)) {
+        return;
+      }
+      const filteredFocusableElements = getFocusableElements(toolbar);
+      (_filteredFocusableEle = filteredFocusableElements[0]) === null || _filteredFocusableEle === void 0 ? void 0 : _filteredFocusableEle.focus();
+
+      // the button element removes the focus ring so this class adds it back
+      if (((_filteredFocusableEle2 = filteredFocusableElements[0]) === null || _filteredFocusableEle2 === void 0 ? void 0 : _filteredFocusableEle2.tagName) === 'BUTTON') {
+        filteredFocusableElements[0].classList.add('first-floating-toolbar-button');
+      }
+      (_filteredFocusableEle3 = filteredFocusableElements[0]) === null || _filteredFocusableEle3 === void 0 ? void 0 : _filteredFocusableEle3.scrollIntoView({
+        behavior: 'smooth',
+        block: 'center',
+        inline: 'nearest'
+      });
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    handleEscape: event => {
+      const isDropdownOpen = !!document.querySelector('[data-toolbar-component="menu-section"]');
+      if (isDropdownOpen) {
+        return;
+      }
+      api === null || api === void 0 ? void 0 : api.core.actions.focus();
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    ariaControls: EDIT_AREA_ID,
+    ariaLabel: intl.formatMessage(fullPageMessages.toolbarLabel)
+  };
 };

package/dist/es2019/ui/toolbar-components.js

@@ -18,7 +18,8 @@ export const getToolbarComponents = (api, disableSelectionToolbar) => {
     }) => {
       return /*#__PURE__*/React.createElement(Toolbar, {
         label: SELECTION_TOOLBAR_LABEL,
-        actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR
+        actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
+        testId: expValEquals('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? 'editor-floating-toolbar' : undefined
       }, children);
     }
   }, {

package/dist/es2019/ui/utils/toolbar.js

@@ -4,4 +4,22 @@ export const isEventInContainer = (event, containerSelector) => {
     return false;
   }
   return !!target.closest(containerSelector);
+};
+export const isShortcutToFocusToolbar = event => {
+  return event.altKey && event.key === 'F10';
+};
+export const getFocusableElements = rootNode => {
+  if (!rootNode) {
+    return [];
+  }
+  const focusableElements = rootNode.querySelectorAll('a[href], button:not([disabled]), textarea, input, select, div[tabindex="-1"], div[tabindex="0"]') || [];
+  const focusableElementsArray = Array.from(focusableElements);
+
+  // filter out focusable elements from child components such as dropdown menus / popups
+  return focusableElementsArray.filter(elm => {
+    const style = window.getComputedStyle(elm);
+
+    // filter out invisible elements
+    return style.visibility !== 'hidden' && style.display !== 'none';
+  });
 };

package/dist/esm/toolbarPlugin.js

@@ -4,12 +4,60 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { bind } from 'bind-event-listener';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { findSelectedNodeOfType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createComponentRegistry } from '@atlaskit/editor-toolbar-model';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorToolbarPluginKey } from './pm-plugins/plugin-key';
 import { DEFAULT_POPUP_SELECTORS } from './ui/consts';
 import { SelectionToolbar } from './ui/SelectionToolbar';
 import { getToolbarComponents } from './ui/toolbar-components';
 import { isEventInContainer } from './ui/utils/toolbar';
+function getSelectedNode(editorState) {
+  var selection = editorState.selection;
+  if (selection instanceof NodeSelection) {
+    return {
+      node: selection.node,
+      pos: selection.from,
+      nodeType: selection.node.type.name,
+      marks: selection.node.marks.map(function (mark) {
+        return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
+      })
+    };
+  }
+  var nodes = editorState.schema.nodes;
+  var selectedNode = findSelectedNodeOfType([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock])(selection);
+  if (selectedNode) {
+    return {
+      node: selectedNode.node,
+      pos: selectedNode.pos,
+      nodeType: selectedNode.node.type.name,
+      marks: selectedNode.node.marks.map(function (mark) {
+        return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
+      })
+    };
+  }
+  var parentNode = findParentNodeOfType([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.listItem, nodes.taskItem])(selection);
+  if (parentNode) {
+    return {
+      node: parentNode.node,
+      pos: parentNode.pos,
+      nodeType: parentNode.node.type.name,
+      marks: parentNode.node.marks.map(function (mark) {
+        return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
+      })
+    };
+  }
+  var $pos = selection.$from;
+  return {
+    node: $pos.parent,
+    pos: $pos.pos,
+    nodeType: $pos.parent.type.name,
+    marks: $pos.marks().map(function (mark) {
+      return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
+    })
+  };
+}
 export var toolbarPlugin = function toolbarPlugin(_ref) {
   var api = _ref.api,
     _ref$config = _ref.config,
@@ -50,16 +98,28 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
           return new SafePlugin({
             key: editorToolbarPluginKey,
             state: {
-              init: function init() {
+              init: function init(_, editorState) {
                 return {
-                  shouldShowToolbar: false
+                  shouldShowToolbar: false,
+                  selectedNode: getSelectedNode(editorState)
                 };
               },
-              apply: function apply(tr, pluginState) {
+              apply: function apply(tr, pluginState, _, newState) {
                 var meta = tr.getMeta(editorToolbarPluginKey);
-                var newPluginState = pluginState;
+                var newPluginState = _objectSpread({}, pluginState);
+                if (expValEquals('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true)) {
+                  var shouldUpdateNode = tr.docChanged || tr.selectionSet;
+                  if (shouldUpdateNode) {
+                    var newSelectedNode = getSelectedNode(newState);
+                    var oldNode = pluginState.selectedNode;
+                    var hasNodeChanged = !oldNode || !newSelectedNode || oldNode.nodeType !== newSelectedNode.nodeType || oldNode.pos !== newSelectedNode.pos || JSON.stringify(oldNode.marks) !== JSON.stringify(newSelectedNode.marks);
+                    if (hasNodeChanged) {
+                      newPluginState.selectedNode = newSelectedNode;
+                    }
+                  }
+                }
                 if (meta) {
-                  return _objectSpread(_objectSpread({}, newPluginState), meta);
+                  newPluginState = _objectSpread(_objectSpread({}, newPluginState), meta);
                 }
                 return newPluginState;
               }

package/dist/esm/ui/SelectionToolbar/index.js

@@ -1,8 +1,11 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
+import { useIntl } from 'react-intl-next';
+import { getDocument } from '@atlaskit/browser-apis';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { fullPageMessages } from '@atlaskit/editor-common/messages';
 import { EditorToolbarProvider, EditorToolbarUIProvider } from '@atlaskit/editor-common/toolbar';
-import { Popup } from '@atlaskit/editor-common/ui';
+import { Popup, EDIT_AREA_ID } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { calculateToolbarPositionTrackHead, calculateToolbarPositionOnCellSelection } from '@atlaskit/editor-common/utils';
 import { AllSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -13,6 +16,7 @@ import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react'
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { SELECTION_TOOLBAR_LABEL } from '../consts';
+import { getFocusableElements, isShortcutToFocusToolbar } from '../utils/toolbar';
 var isToolbarComponent = function isToolbarComponent(component) {
   return component.type === 'toolbar' && component.key === 'inline-text-toolbar';
 };
@@ -20,11 +24,12 @@ var usePluginState = conditionalHooksFactory(function () {
   return expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
 }, function (api) {
   return useSharedPluginStateWithSelector(api, ['connectivity', 'userPreferences', 'toolbar', 'selection', 'userIntent', 'editorViewMode'], function (state) {
-    var _state$connectivitySt, _state$userPreference, _state$toolbarState, _state$selectionState, _state$userIntentStat, _state$editorViewMode;
+    var _state$connectivitySt, _state$userPreference, _state$toolbarState, _state$toolbarState2, _state$selectionState, _state$userIntentStat, _state$editorViewMode;
     return {
       connectivityStateMode: (_state$connectivitySt = state.connectivityState) === null || _state$connectivitySt === void 0 ? void 0 : _state$connectivitySt.mode,
       editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 || (_state$userPreference = _state$userPreference.preferences) === null || _state$userPreference === void 0 ? void 0 : _state$userPreference.toolbarDockingPosition,
       shouldShowToolbar: (_state$toolbarState = state.toolbarState) === null || _state$toolbarState === void 0 ? void 0 : _state$toolbarState.shouldShowToolbar,
+      selectedNode: (_state$toolbarState2 = state.toolbarState) === null || _state$toolbarState2 === void 0 ? void 0 : _state$toolbarState2.selectedNode,
       selection: (_state$selectionState = state.selectionState) === null || _state$selectionState === void 0 ? void 0 : _state$selectionState.selection,
       currentUserIntent: (_state$userIntentStat = state.userIntentState) === null || _state$userIntentStat === void 0 ? void 0 : _state$userIntentStat.currentUserIntent,
       editorViewMode: (_state$editorViewMode = state.editorViewModeState) === null || _state$editorViewMode === void 0 ? void 0 : _state$editorViewMode.mode
@@ -36,19 +41,22 @@ var usePluginState = conditionalHooksFactory(function () {
   var currentUserIntent = useSharedPluginStateSelector(api, 'userIntent.currentUserIntent');
   var selection = useSharedPluginStateSelector(api, 'selection.selection');
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['toolbar'], function (state) {
-      var _state$toolbarState2;
+      var _state$toolbarState3, _state$toolbarState4;
       return {
-        shouldShowToolbar: (_state$toolbarState2 = state.toolbarState) === null || _state$toolbarState2 === void 0 ? void 0 : _state$toolbarState2.shouldShowToolbar
+        shouldShowToolbar: (_state$toolbarState3 = state.toolbarState) === null || _state$toolbarState3 === void 0 ? void 0 : _state$toolbarState3.shouldShowToolbar,
+        selectedNode: (_state$toolbarState4 = state.toolbarState) === null || _state$toolbarState4 === void 0 ? void 0 : _state$toolbarState4.selectedNode
       };
     }),
-    shouldShowToolbar = _useSharedPluginState.shouldShowToolbar;
+    shouldShowToolbar = _useSharedPluginState.shouldShowToolbar,
+    selectedNode = _useSharedPluginState.selectedNode;
   return {
     connectivityStateMode: connectivityStateMode,
     editorToolbarDockingPreference: editorToolbarDockingPreference,
     currentUserIntent: currentUserIntent,
     shouldShowToolbar: shouldShowToolbar,
     selection: selection,
-    editorViewMode: undefined
+    editorViewMode: undefined,
+    selectedNode: selectedNode
   };
 });
 export var SelectionToolbar = function SelectionToolbar(_ref) {
@@ -64,10 +72,14 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
     shouldShowToolbar = _usePluginState.shouldShowToolbar,
     editorViewMode = _usePluginState.editorViewMode,
     selection = _usePluginState.selection;
+  var intl = useIntl();
   var components = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.getComponents();
   var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
     return isToolbarComponent(component);
   });
+  var keyboardNavigation = useMemo(function () {
+    return getKeyboardNavigationConfig(editorView, intl, api);
+  }, [editorView, intl, api]);
   var isOffline = connectivityStateMode === 'offline';
   var isTextSelection = !editorView.state.selection.empty && editorView.state.selection instanceof TextSelection;
   var isAllSelection = !editorView.state.selection.empty && editorView.state.selection instanceof AllSelection && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true);
@@ -81,8 +93,7 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
     if (isCellSelection && isEditorControlsEnabled) {
       return calculateToolbarPositionOnCellSelection(toolbarTitle)(editorView, position);
     }
-    var calc = calculateToolbarPositionTrackHead;
-    return calc(toolbarTitle)(editorView, position);
+    return calculateToolbarPositionTrackHead(toolbarTitle)(editorView, position);
   }, [editorView]);
   if (expValEquals('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && editorToolbarDockingPreference === 'top' && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
@@ -107,7 +118,8 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
     fireAnalyticsEvent: expValEquals('platform_editor_toolbar_aifc_toolbar_analytic', 'isEnabled', true) ? function (payload) {
       var _api$analytics;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent(payload);
-    } : undefined
+    } : undefined,
+    keyboardNavigation: expValEquals('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? keyboardNavigation : undefined
   }, /*#__PURE__*/React.createElement(ToolbarModelRenderer, {
     toolbar: toolbar,
     components: components,
@@ -149,4 +161,47 @@ var getDomRefFromSelection = function getDomRefFromSelection(view
     // 	dispatchAnalyticsEvent(payload);
     // }
   }
+};
+var getKeyboardNavigationConfig = function getKeyboardNavigationConfig(editorView, intl, api) {
+  if (!(editorView.dom instanceof HTMLElement)) {
+    return;
+  }
+  var toolbarSelector = "[data-testid='editor-floating-toolbar']";
+  return {
+    childComponentSelector: toolbarSelector,
+    dom: editorView.dom,
+    isShortcutToFocusToolbar: isShortcutToFocusToolbar,
+    handleFocus: function handleFocus(event) {
+      var _getDocument, _filteredFocusableEle, _filteredFocusableEle2, _filteredFocusableEle3;
+      var toolbar = (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.querySelector(toolbarSelector);
+      if (!(toolbar instanceof HTMLElement)) {
+        return;
+      }
+      var filteredFocusableElements = getFocusableElements(toolbar);
+      (_filteredFocusableEle = filteredFocusableElements[0]) === null || _filteredFocusableEle === void 0 || _filteredFocusableEle.focus();
+
+      // the button element removes the focus ring so this class adds it back
+      if (((_filteredFocusableEle2 = filteredFocusableElements[0]) === null || _filteredFocusableEle2 === void 0 ? void 0 : _filteredFocusableEle2.tagName) === 'BUTTON') {
+        filteredFocusableElements[0].classList.add('first-floating-toolbar-button');
+      }
+      (_filteredFocusableEle3 = filteredFocusableElements[0]) === null || _filteredFocusableEle3 === void 0 || _filteredFocusableEle3.scrollIntoView({
+        behavior: 'smooth',
+        block: 'center',
+        inline: 'nearest'
+      });
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    handleEscape: function handleEscape(event) {
+      var isDropdownOpen = !!document.querySelector('[data-toolbar-component="menu-section"]');
+      if (isDropdownOpen) {
+        return;
+      }
+      api === null || api === void 0 || api.core.actions.focus();
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    ariaControls: EDIT_AREA_ID,
+    ariaLabel: intl.formatMessage(fullPageMessages.toolbarLabel)
+  };
 };

package/dist/esm/ui/toolbar-components.js

@@ -18,7 +18,8 @@ export var getToolbarComponents = function getToolbarComponents(api, disableSele
       var children = _ref.children;
       return /*#__PURE__*/React.createElement(Toolbar, {
         label: SELECTION_TOOLBAR_LABEL,
-        actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR
+        actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
+        testId: expValEquals('platform_editor_toolbar_aifc_patch_5', 'isEnabled', true) ? 'editor-floating-toolbar' : undefined
       }, children);
     }
   }, {

package/dist/esm/ui/utils/toolbar.js

@@ -4,4 +4,22 @@ export var isEventInContainer = function isEventInContainer(event, containerSele
     return false;
   }
   return !!target.closest(containerSelector);
+};
+export var isShortcutToFocusToolbar = function isShortcutToFocusToolbar(event) {
+  return event.altKey && event.key === 'F10';
+};
+export var getFocusableElements = function getFocusableElements(rootNode) {
+  if (!rootNode) {
+    return [];
+  }
+  var focusableElements = rootNode.querySelectorAll('a[href], button:not([disabled]), textarea, input, select, div[tabindex="-1"], div[tabindex="0"]') || [];
+  var focusableElementsArray = Array.from(focusableElements);
+
+  // filter out focusable elements from child components such as dropdown menus / popups
+  return focusableElementsArray.filter(function (elm) {
+    var style = window.getComputedStyle(elm);
+
+    // filter out invisible elements
+    return style.visibility !== 'hidden' && style.display !== 'none';
+  });
 };

package/dist/types/toolbarPlugin.d.ts

@@ -1,5 +1,2 @@
 import type { ToolbarPlugin } from './toolbarPluginType';
-export type EditorToolbarPluginState = {
-    shouldShowToolbar: boolean;
-};
 export declare const toolbarPlugin: ToolbarPlugin;

package/dist/types/toolbarPluginType.d.ts

@@ -5,8 +5,18 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { RegisterComponent } from '@atlaskit/editor-toolbar-model';
 import type { RegisterComponentsAction, ToolbarPluginOptions } from './types';
+export type EditorToolbarPluginState = {
+    selectedNode?: {
+        marks: string[];
+        node: PMNode;
+        nodeType: string;
+        pos: number;
+    };
+    shouldShowToolbar: boolean;
+};
 export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
     actions: {
         getComponents: () => Array<RegisterComponent>;
@@ -21,7 +31,5 @@ export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
         OptionalPlugin<AnalyticsPlugin>
     ];
     pluginConfiguration?: ToolbarPluginOptions;
-    sharedState: {
-        shouldShowToolbar: boolean;
-    };
+    sharedState: EditorToolbarPluginState;
 }>;

package/dist/types/ui/utils/toolbar.d.ts

@@ -1 +1,3 @@
 export declare const isEventInContainer: (event: Event, containerSelector: string) => boolean;
+export declare const isShortcutToFocusToolbar: (event: KeyboardEvent) => boolean;
+export declare const getFocusableElements: (rootNode: HTMLElement | null) => Array<HTMLElement>;

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

@@ -1,5 +1,2 @@
 import type { ToolbarPlugin } from './toolbarPluginType';
-export type EditorToolbarPluginState = {
-    shouldShowToolbar: boolean;
-};
 export declare const toolbarPlugin: ToolbarPlugin;

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

@@ -5,8 +5,18 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { RegisterComponent } from '@atlaskit/editor-toolbar-model';
 import type { RegisterComponentsAction, ToolbarPluginOptions } from './types';
+export type EditorToolbarPluginState = {
+    selectedNode?: {
+        marks: string[];
+        node: PMNode;
+        nodeType: string;
+        pos: number;
+    };
+    shouldShowToolbar: boolean;
+};
 export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
     actions: {
         getComponents: () => Array<RegisterComponent>;
@@ -21,7 +31,5 @@ export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
         OptionalPlugin<AnalyticsPlugin>
     ];
     pluginConfiguration?: ToolbarPluginOptions;
-    sharedState: {
-        shouldShowToolbar: boolean;
-    };
+    sharedState: EditorToolbarPluginState;
 }>;

package/dist/types-ts4.5/ui/utils/toolbar.d.ts

@@ -1 +1,3 @@
 export declare const isEventInContainer: (event: Event, containerSelector: string) => boolean;
+export declare const isShortcutToFocusToolbar: (event: KeyboardEvent) => boolean;
+export declare const getFocusableElements: (rootNode: HTMLElement | null) => Array<HTMLElement>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "2.1.3",
+	"version": "2.1.5",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,6 +28,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
+		"@atlaskit/browser-apis": "^0.0.1",
 		"@atlaskit/editor-plugin-analytics": "^5.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^5.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^7.0.0",
@@ -38,13 +39,13 @@
 		"@atlaskit/editor-toolbar": "^0.9.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^12.21.0",
+		"@atlaskit/tmp-editor-statsig": "^12.28.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.6.0",
+		"@atlaskit/editor-common": "^109.12.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {