@atlaskit/editor-plugin-insert-block 7.0.6 → 7.0.8

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 7.0.8
+
+### Patch Changes
+
+- [`e38eb931c4472`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e38eb931c4472) -
+  [FD-101539] clean up platform_editor_refactor_view_more_fix
+- [`482bcdc75598e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/482bcdc75598e) -
+  ED-29462 Clean up platform_editor_toolbar_aifc_responsiveness_update
+- Updated dependencies
+
+## 7.0.7
+
+### Patch Changes
+
+- [`872bd8d576773`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/872bd8d576773) -
+  [ux] ED-29272 Add missing tooltip and shortcut for TextColorDropdownMenu
+- Updated dependencies
+
 ## 7.0.6
 
 ### Patch Changes

package/dist/cjs/insertBlockPlugin.js

@@ -171,16 +171,9 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
     exposure: true
   })) {
     var _api$toolbar, _api$codeBlock, _api$panel, _api$blockType;
-    api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || _api$toolbar.actions.registerComponents((0, _toolbarComponents.getToolbarComponentsWithConfig)({
+    api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || _api$toolbar.actions.registerComponents((0, _toolbarComponents.getToolbarComponents)({
       api: api,
-      tableSelectorSupported: options.tableSelectorSupported,
-      toolbarShowPlusInsertOnly: options.toolbarShowPlusInsertOnly,
-      showElementBrowserLink: options.showElementBrowserLink,
       onInsertBlockType: handleInsertBlockType(api === null || api === void 0 || (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 ? void 0 : _api$codeBlock.actions.insertCodeBlock, api === null || api === void 0 || (_api$panel = api.panel) === null || _api$panel === void 0 ? void 0 : _api$panel.actions.insertPanel, api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : _api$blockType.actions.insertBlockQuote),
-      nativeStatusSupported: options.nativeStatusSupported,
-      horizontalRuleEnabled: options.horizontalRuleEnabled,
-      expandEnabled: options.allowExpand,
-      insertMenuItems: options.insertMenuItems,
       options: options
     }));
   } else {

package/dist/cjs/ui/ElementBrowser/InsertMenu.js

@@ -212,7 +212,7 @@ var InsertMenu = function InsertMenu(_ref) {
       ,
       key: quickInsertDropdownItems.length,
       viewMoreItem: viewMoreItem,
-      onViewMore: showElementBrowserLink || !(0, _platformFeatureFlags.fg)('platform_editor_refactor_view_more_fix') ? onViewMore : undefined,
+      onViewMore: showElementBrowserLink ? onViewMore : undefined,
       cache: cache
     })))
   );

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

@@ -8,6 +8,7 @@ exports.EmojiButton = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -58,7 +59,10 @@ var EmojiButton = exports.EmojiButton = function EmojiButton(_ref) {
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement
   }), /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.emoji)
+    content: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+      description: formatMessage(_messages.toolbarInsertBlockMessages.emoji),
+      keymap: _keymaps.insertEmoji
+    }) : formatMessage(_messages.toolbarInsertBlockMessages.emoji)
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
     iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.EmojiIcon, {
       label: formatMessage(_messages.toolbarInsertBlockMessages.emoji),

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

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _ui = require("@atlaskit/editor-common/ui");
@@ -17,6 +18,7 @@ var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _InsertMenu = _interopRequireWildcard(require("../ElementBrowser/InsertMenu"));
 var _useEmojiPickerPopup = require("./hooks/useEmojiPickerPopup");
 var _useInsertButtonState2 = require("./hooks/useInsertButtonState");
@@ -235,13 +237,16 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement
   }), /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.insertMenu)
+    content: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+      description: formatMessage(_messages.toolbarInsertBlockMessages.insertMenu),
+      keymap: _keymaps.insertElements
+    }) : formatMessage(_messages.toolbarInsertBlockMessages.insertMenu)
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
     iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.AddIcon, {
       size: "small",
       label: formatMessage(_messages.toolbarInsertBlockMessages.insertMenu)
     }),
-    ariaKeyshortcuts: "/",
+    ariaKeyshortcuts: (0, _keymaps.getAriaKeyshortcuts)(_keymaps.insertElements),
     ref: insertButtonRef,
     onClick: onClick,
     isSelected: insertMenuOpen,

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

@@ -9,8 +9,10 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var MentionButton = exports.MentionButton = function MentionButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -34,7 +36,10 @@ var MentionButton = exports.MentionButton = function MentionButton(_ref) {
     api === null || api === void 0 || (_api$mention = api.mention) === null || _api$mention === void 0 || (_api$mention = _api$mention.actions) === null || _api$mention === void 0 || _api$mention.openTypeAhead(_analytics.INPUT_METHOD.TOOLBAR);
   };
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.mention)
+    content: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+      description: formatMessage(_messages.toolbarInsertBlockMessages.mention),
+      keymap: _keymaps.insertMention
+    }) : formatMessage(_messages.toolbarInsertBlockMessages.mention)
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
     iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.MentionIcon, {
       label: formatMessage(_messages.toolbarInsertBlockMessages.mention),

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

@@ -12,6 +12,7 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var TableButton = exports.TableButton = function TableButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -41,13 +42,16 @@ var TableButton = exports.TableButton = function TableButton(_ref) {
     }
   };
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.table)
+    content: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+      description: formatMessage(_messages.toolbarInsertBlockMessages.table),
+      keymap: _keymaps.toggleTable
+    }) : formatMessage(_messages.toolbarInsertBlockMessages.table)
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
     iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TableIcon, {
       label: formatMessage(_messages.toolbarInsertBlockMessages.table),
       size: "small"
     }),
     onClick: onClick,
-    ariaKeyshortcuts: (0, _keymaps.formatShortcut)(_keymaps.toggleTable)
+    ariaKeyshortcuts: (0, _keymaps.getAriaKeyshortcuts)(_keymaps.toggleTable)
   }));
 };

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

@@ -8,9 +8,11 @@ exports.TaskListButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var TaskListButton = exports.TaskListButton = function TaskListButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -29,7 +31,10 @@ var TaskListButton = exports.TaskListButton = function TaskListButton(_ref) {
     }
   };
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.action)
+    content: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+      description: formatMessage(_messages.toolbarInsertBlockMessages.action),
+      keymap: _keymaps.insertTaskList
+    }) : formatMessage(_messages.toolbarInsertBlockMessages.action)
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
     iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TaskIcon, {
       label: formatMessage(_messages.toolbarInsertBlockMessages.action),

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

@@ -4,8 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getToolbarComponentsWithConfig = exports.getToolbarComponentsUpdated = exports.getToolbarComponents = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+exports.getToolbarComponents = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
@@ -21,270 +20,22 @@ var _MentionButton = require("./toolbar-components/MentionButton");
 var _TableButton = require("./toolbar-components/TableButton");
 var _TableSizePicker = require("./toolbar-components/TableSizePicker");
 var _TaskListButton = require("./toolbar-components/TaskListButton");
-var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(_ref) {
-  var api = _ref.api,
-    tableSelectorSupported = _ref.tableSelectorSupported,
-    toolbarShowPlusInsertOnly = _ref.toolbarShowPlusInsertOnly,
-    showElementBrowserLink = _ref.showElementBrowserLink,
-    onInsertBlockType = _ref.onInsertBlockType,
-    nativeStatusSupported = _ref.nativeStatusSupported,
-    horizontalRuleEnabled = _ref.horizontalRuleEnabled,
-    expandEnabled = _ref.expandEnabled,
-    insertMenuItems = _ref.insertMenuItems;
-  return (0, _toConsumableArray2.default)(toolbarShowPlusInsertOnly ? [{
-    type: _toolbar.INSERT_GROUP.type,
-    key: _toolbar.INSERT_GROUP.key,
-    parents: [{
-      type: _toolbar.INSERT_BLOCK_SECTION.type,
-      key: _toolbar.INSERT_BLOCK_SECTION.key,
-      rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
-    }]
-  }, {
-    type: _toolbar.INSERT_BUTTON.type,
-    key: _toolbar.INSERT_BUTTON.key,
-    parents: [{
-      type: _toolbar.INSERT_GROUP.type,
-      key: _toolbar.INSERT_GROUP.key,
-      rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
-    }],
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_InsertButton.InsertButton, {
-        api: api,
-        showElementBrowserLink: showElementBrowserLink,
-        tableSelectorSupported: tableSelectorSupported,
-        onInsertBlockType: onInsertBlockType,
-        nativeStatusSupported: nativeStatusSupported,
-        horizontalRuleEnabled: horizontalRuleEnabled,
-        expandEnabled: expandEnabled,
-        insertMenuItems: insertMenuItems
-      });
-    }
-  }] : [{
-    type: _toolbar.TASK_LIST_GROUP.type,
-    key: _toolbar.TASK_LIST_GROUP.key,
-    parents: [{
-      type: _toolbar.INSERT_BLOCK_SECTION.type,
-      key: _toolbar.INSERT_BLOCK_SECTION.key,
-      rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.TASK_LIST_GROUP.key]
-    }],
-    component: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true) ? function (_ref2) {
-      var children = _ref2.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-        above: "lg"
-      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-    } : undefined
-  }, {
-    type: _toolbar.TASK_LIST_BUTTON.type,
-    key: _toolbar.TASK_LIST_BUTTON.key,
-    parents: [{
-      type: _toolbar.TASK_LIST_GROUP.type,
-      key: _toolbar.TASK_LIST_GROUP.key,
-      rank: _toolbar.TASK_LIST_GROUP_RANK[_toolbar.TASK_LIST_BUTTON.key]
-    }],
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_TaskListButton.TaskListButton, {
-        api: api
-      });
-    }
-  }, {
-    type: _toolbar.MEDIA_GROUP.type,
-    key: _toolbar.MEDIA_GROUP.key,
-    parents: [{
-      type: _toolbar.INSERT_BLOCK_SECTION.type,
-      key: _toolbar.INSERT_BLOCK_SECTION.key,
-      rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.MEDIA_GROUP.key]
-    }],
-    component: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true) ? function (_ref3) {
-      var children = _ref3.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-        above: "lg"
-      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-    } : undefined
-  }, {
-    type: _toolbar.MEDIA_BUTTON.type,
-    key: _toolbar.MEDIA_BUTTON.key,
-    parents: [{
-      type: _toolbar.MEDIA_GROUP.type,
-      key: _toolbar.MEDIA_GROUP.key,
-      rank: _toolbar.MEDIA_GROUP_RANK[_toolbar.MEDIA_BUTTON.key]
-    }],
-    component: function component() {
-      return !!(api !== null && api !== void 0 && api.imageUpload) ? /*#__PURE__*/_react.default.createElement(_ImageButton.ImageButton, {
-        api: api
-      }) : /*#__PURE__*/_react.default.createElement(_MediaButton.MediaButton, {
-        api: api
-      });
-    }
-  }, {
-    type: _toolbar.MENTION_GROUP.type,
-    key: _toolbar.MENTION_GROUP.key,
-    parents: [{
-      type: _toolbar.INSERT_BLOCK_SECTION.type,
-      key: _toolbar.INSERT_BLOCK_SECTION.key,
-      rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.MENTION_GROUP.key]
-    }],
-    component: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true) ? function (_ref4) {
-      var children = _ref4.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-        above: "lg"
-      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-    } : undefined
-  }, {
-    type: _toolbar.MENTION_BUTTON.type,
-    key: _toolbar.MENTION_BUTTON.key,
-    parents: [{
-      type: _toolbar.MENTION_GROUP.type,
-      key: _toolbar.MENTION_GROUP.key,
-      rank: _toolbar.MENTION_GROUP_RANK[_toolbar.MENTION_BUTTON.key]
-    }],
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_MentionButton.MentionButton, {
-        api: api
-      });
-    }
-  }, {
-    type: _toolbar.EMOJI_GROUP.type,
-    key: _toolbar.EMOJI_GROUP.key,
-    parents: [{
-      type: _toolbar.INSERT_BLOCK_SECTION.type,
-      key: _toolbar.INSERT_BLOCK_SECTION.key,
-      rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.EMOJI_GROUP.key]
-    }],
-    component: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true) ? function (_ref5) {
-      var children = _ref5.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-        above: "lg"
-      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-    } : undefined
-  }, {
-    type: _toolbar.EMOJI_BUTTON.type,
-    key: _toolbar.EMOJI_BUTTON.key,
-    parents: [{
-      type: _toolbar.EMOJI_GROUP.type,
-      key: _toolbar.EMOJI_GROUP.key,
-      rank: _toolbar.EMOJI_GROUP_RANK[_toolbar.EMOJI_BUTTON.key]
-    }],
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_EmojiButton.EmojiButton, {
-        api: api
-      });
-    }
-  }, {
-    type: _toolbar.LAYOUT_GROUP.type,
-    key: _toolbar.LAYOUT_GROUP.key,
-    parents: [{
-      type: _toolbar.INSERT_BLOCK_SECTION.type,
-      key: _toolbar.INSERT_BLOCK_SECTION.key,
-      rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.LAYOUT_GROUP.key]
-    }],
-    component: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true) ? function (_ref6) {
-      var children = _ref6.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-        above: "lg"
-      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-    } : undefined
-  }, {
-    type: _toolbar.LAYOUT_BUTTON.type,
-    key: _toolbar.LAYOUT_BUTTON.key,
-    parents: [{
-      type: _toolbar.LAYOUT_GROUP.type,
-      key: _toolbar.LAYOUT_GROUP.key,
-      rank: _toolbar.LAYOUT_GROUP_RANK[_toolbar.LAYOUT_BUTTON.key]
-    }],
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_LayoutButton.LayoutButton, {
-        api: api
-      });
-    }
-  }, {
-    type: _toolbar.TABLE_GROUP.type,
-    key: _toolbar.TABLE_GROUP.key,
-    parents: [{
-      type: _toolbar.INSERT_BLOCK_SECTION.type,
-      key: _toolbar.INSERT_BLOCK_SECTION.key,
-      rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.TABLE_GROUP.key]
-    }],
-    component: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true) ? function (_ref7) {
-      var children = _ref7.children;
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-        above: "md"
-      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-    } : undefined
-  }, {
-    type: _toolbar.TABLE_BUTTON.type,
-    key: _toolbar.TABLE_BUTTON.key,
-    parents: [{
-      type: _toolbar.TABLE_GROUP.type,
-      key: _toolbar.TABLE_GROUP.key,
-      rank: _toolbar.TABLE_GROUP_RANK[_toolbar.TABLE_BUTTON.key]
-    }],
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_TableButton.TableButton, {
-        api: api
-      });
-    }
-  }, {
-    type: _toolbar.TABLE_SIZE_PICKER.type,
-    key: _toolbar.TABLE_SIZE_PICKER.key,
-    parents: [{
-      type: _toolbar.TABLE_GROUP.type,
-      key: _toolbar.TABLE_GROUP.key,
-      rank: _toolbar.TABLE_GROUP_RANK[_toolbar.TABLE_SIZE_PICKER.key]
-    }],
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_TableSizePicker.TableSizePicker, {
-        api: api,
-        tableSelectorSupported: tableSelectorSupported
-      });
-    }
-  }, {
-    type: _toolbar.INSERT_GROUP.type,
-    key: _toolbar.INSERT_GROUP.key,
-    parents: [{
-      type: _toolbar.INSERT_BLOCK_SECTION.type,
-      key: _toolbar.INSERT_BLOCK_SECTION.key,
-      rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
-    }]
-  }, {
-    type: _toolbar.INSERT_BUTTON.type,
-    key: _toolbar.INSERT_BUTTON.key,
-    parents: [{
-      type: _toolbar.INSERT_GROUP.type,
-      key: _toolbar.INSERT_GROUP.key,
-      rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
-    }],
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_InsertButton.InsertButton, {
-        api: api,
-        showElementBrowserLink: showElementBrowserLink,
-        tableSelectorSupported: tableSelectorSupported,
-        onInsertBlockType: onInsertBlockType,
-        nativeStatusSupported: nativeStatusSupported,
-        horizontalRuleEnabled: horizontalRuleEnabled,
-        expandEnabled: expandEnabled,
-        insertMenuItems: insertMenuItems,
-        numberOfButtons: 7 // TODO: ED-28759 - Default to 7 buttons - Remove this once we have a proper way to do toolbar responsiveness
-      });
-    }
-  }]);
-};
-
 /**
  * Updated toolbar components function that uses the new configuration resolver.
  * This function replaces the hardcoded approach with a config-driven one.
  */
-var getToolbarComponentsUpdated = exports.getToolbarComponentsUpdated = function getToolbarComponentsUpdated(_ref8) {
+var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(_ref) {
   var _config$taskList, _config$media, _config$codeBlock, _config$mention, _config$emoji, _config$layout, _config$table, _config$insert;
-  var api = _ref8.api,
-    options = _ref8.options,
-    onInsertBlockType = _ref8.onInsertBlockType;
+  var api = _ref.api,
+    options = _ref.options,
+    onInsertBlockType = _ref.onInsertBlockType;
   var config = (0, _configResolver.resolveToolbarConfig)(options);
   var components = [];
 
   // Helper function to create responsive wrapper component
   var createResponsiveComponent = function createResponsiveComponent() {
-    return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true) ? function (_ref9) {
-      var children = _ref9.children;
+    return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsive', 'isEnabled', true) ? function (_ref2) {
+      var children = _ref2.children;
       return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
         above: "lg"
       }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
@@ -541,19 +292,4 @@ var getToolbarComponentsUpdated = exports.getToolbarComponentsUpdated = function
     });
   }
   return components;
-};
-
-/**
- * Main export that switches between old and new implementations based on experiment.
- * This allows for gradual rollout of the new config-driven approach.
- */
-var getToolbarComponentsWithConfig = exports.getToolbarComponentsWithConfig = function getToolbarComponentsWithConfig(props) {
-  if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_responsiveness_update', 'isEnabled', true) && 'options' in props) {
-    // Use new config-driven approach
-    return getToolbarComponentsUpdated(props);
-  }
-
-  // Use legacy approach
-  var legacyProps = props;
-  return getToolbarComponents(legacyProps);
 };

package/dist/es2019/insertBlockPlugin.js

@@ -9,7 +9,7 @@ import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-ty
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { toggleInsertBlockPmKey, toggleInsertBlockPmPlugin } from './pm-plugins/toggleInsertBlock';
-import { getToolbarComponentsWithConfig } from './ui/toolbar-components';
+import { getToolbarComponents } from './ui/toolbar-components';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ToolbarInsertBlock from './ui/ToolbarInsertBlock';
@@ -156,16 +156,9 @@ export const insertBlockPlugin = ({
     exposure: true
   })) {
     var _api$toolbar, _api$codeBlock, _api$panel, _api$blockType;
-    api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.registerComponents(getToolbarComponentsWithConfig({
+    api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.registerComponents(getToolbarComponents({
       api,
-      tableSelectorSupported: options.tableSelectorSupported,
-      toolbarShowPlusInsertOnly: options.toolbarShowPlusInsertOnly,
-      showElementBrowserLink: options.showElementBrowserLink,
       onInsertBlockType: handleInsertBlockType(api === null || api === void 0 ? void 0 : (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 ? void 0 : _api$codeBlock.actions.insertCodeBlock, api === null || api === void 0 ? void 0 : (_api$panel = api.panel) === null || _api$panel === void 0 ? void 0 : _api$panel.actions.insertPanel, api === null || api === void 0 ? void 0 : (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : _api$blockType.actions.insertBlockQuote),
-      nativeStatusSupported: options.nativeStatusSupported,
-      horizontalRuleEnabled: options.horizontalRuleEnabled,
-      expandEnabled: options.allowExpand,
-      insertMenuItems: options.insertMenuItems,
       options
     }));
   } else {

package/dist/es2019/ui/ElementBrowser/InsertMenu.js

@@ -182,7 +182,7 @@ const InsertMenu = ({
       ,
       key: quickInsertDropdownItems.length,
       viewMoreItem: viewMoreItem,
-      onViewMore: showElementBrowserLink || !fg('platform_editor_refactor_view_more_fix') ? onViewMore : undefined,
+      onViewMore: showElementBrowserLink ? onViewMore : undefined,
       cache: cache
     })))
   );

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

@@ -1,6 +1,7 @@
 import React, { useRef } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { ToolTipContent, insertEmoji } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarButton, ToolbarTooltip, EmojiIcon } from '@atlaskit/editor-toolbar';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -53,7 +54,10 @@ export const EmojiButton = ({
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement
   }), /*#__PURE__*/React.createElement(ToolbarTooltip, {
-    content: formatMessage(messages.emoji)
+    content: expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ToolTipContent, {
+      description: formatMessage(messages.emoji),
+      keymap: insertEmoji
+    }) : formatMessage(messages.emoji)
   }, /*#__PURE__*/React.createElement(ToolbarButton, {
     iconBefore: /*#__PURE__*/React.createElement(EmojiIcon, {
       label: formatMessage(messages.emoji),

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

@@ -1,6 +1,7 @@
 import React, { useRef, useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { getAriaKeyshortcuts, insertElements, ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { Popup } from '@atlaskit/editor-common/ui';
@@ -8,6 +9,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarButton, ToolbarTooltip, AddIcon, useToolbarUI } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import InsertMenu, { DEFAULT_HEIGHT } from '../ElementBrowser/InsertMenu';
 import { useEmojiPickerPopup } from './hooks/useEmojiPickerPopup';
 import { useInsertButtonState } from './hooks/useInsertButtonState';
@@ -228,13 +230,16 @@ export const InsertButton = ({
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement
   }), /*#__PURE__*/React.createElement(ToolbarTooltip, {
-    content: formatMessage(messages.insertMenu)
+    content: expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ToolTipContent, {
+      description: formatMessage(messages.insertMenu),
+      keymap: insertElements
+    }) : formatMessage(messages.insertMenu)
   }, /*#__PURE__*/React.createElement(ToolbarButton, {
     iconBefore: /*#__PURE__*/React.createElement(AddIcon, {
       size: "small",
       label: formatMessage(messages.insertMenu)
     }),
-    ariaKeyshortcuts: "/",
+    ariaKeyshortcuts: getAriaKeyshortcuts(insertElements),
     ref: insertButtonRef,
     onClick: onClick,
     isSelected: insertMenuOpen,

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

@@ -2,8 +2,10 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { ToolTipContent, insertMention } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { ToolbarButton, ToolbarTooltip, MentionIcon } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const MentionButton = ({
   api
 }) => {
@@ -30,7 +32,10 @@ export const MentionButton = ({
     api === null || api === void 0 ? void 0 : (_api$mention = api.mention) === null || _api$mention === void 0 ? void 0 : (_api$mention$actions = _api$mention.actions) === null || _api$mention$actions === void 0 ? void 0 : _api$mention$actions.openTypeAhead(INPUT_METHOD.TOOLBAR);
   };
   return /*#__PURE__*/React.createElement(ToolbarTooltip, {
-    content: formatMessage(messages.mention)
+    content: expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ToolTipContent, {
+      description: formatMessage(messages.mention),
+      keymap: insertMention
+    }) : formatMessage(messages.mention)
   }, /*#__PURE__*/React.createElement(ToolbarButton, {
     iconBefore: /*#__PURE__*/React.createElement(MentionIcon, {
       label: formatMessage(messages.mention),

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

@@ -1,10 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { formatShortcut, toggleTable } from '@atlaskit/editor-common/keymaps';
+import { ToolTipContent, getAriaKeyshortcuts, toggleTable } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarButton, ToolbarTooltip, TableIcon } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const TableButton = ({
   api
 }) => {
@@ -39,13 +40,16 @@ export const TableButton = ({
     }
   };
   return /*#__PURE__*/React.createElement(ToolbarTooltip, {
-    content: formatMessage(messages.table)
+    content: expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ToolTipContent, {
+      description: formatMessage(messages.table),
+      keymap: toggleTable
+    }) : formatMessage(messages.table)
   }, /*#__PURE__*/React.createElement(ToolbarButton, {
     iconBefore: /*#__PURE__*/React.createElement(TableIcon, {
       label: formatMessage(messages.table),
       size: "small"
     }),
     onClick: onClick,
-    ariaKeyshortcuts: formatShortcut(toggleTable)
+    ariaKeyshortcuts: getAriaKeyshortcuts(toggleTable)
   }));
 };