@atlaskit/editor-plugin-toolbar 3.4.14 → 3.4.16

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 3.4.16
+
+### Patch Changes
+
+- [`5baa955ebe237`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5baa955ebe237) -
+  Add new menu section for all extensions (inc. loom and 1p, 3p extensions), add logic to hide menu
+  button completely when there are no menu-sections with no menu-items associated with it
+- Updated dependencies
+
+## 3.4.15
+
+### Patch Changes
+
+- [`55920a92e882a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/55920a92e882a) -
+  tsignores added for help-center local consumpton removed
+- Updated dependencies
+
 ## 3.4.14
 
 ### Patch Changes

package/dist/cjs/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -63,8 +63,6 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
     }), new _experiences.ExperienceCheckDomMutation({
       onDomMutation: function onDomMutation(_ref2) {
         var mutations = _ref2.mutations;
-        // @ts-ignore - Workaround for help-center local consumption
-
         if (mutations.some(isSelectionToolbarAddedInMutation)) {
           return {
             status: 'success'
@@ -87,8 +85,6 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
       init: function init() {
         return {};
       },
-      // @ts-ignore - Workaround for help-center local consumption
-
       apply: function apply(_tr, pluginState, oldState, newState) {
         if (!oldState.selection.empty && isSelectionWithoutTextContent(newState.selection)) {
           experience.abort({
@@ -105,8 +101,6 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
       }
     },
     props: {
-      // @ts-ignore - Workaround for help-center local consumption
-
       handleDOMEvents: {
         mousedown: function mousedown(_view, e) {
           mouseDownPos = {
@@ -157,8 +151,6 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
 var isSelectionToolbarAddedInMutation = function isSelectionToolbarAddedInMutation(_ref4) {
   var type = _ref4.type,
     addedNodes = _ref4.addedNodes;
-  // @ts-ignore - Workaround for help-center local consumption
-
   return type === 'childList' && (0, _toConsumableArray2.default)(addedNodes).some(isSelectionToolbarWithinNode);
 };
 var isSelectionToolbarWithinNode = function isSelectionToolbarWithinNode(node) {

package/dist/cjs/toolbarPlugin.js

@@ -30,8 +30,6 @@ function getSelectedNode(editorState) {
       node: selection.node,
       pos: selection.from,
       nodeType: selection.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: selection.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -44,8 +42,6 @@ function getSelectedNode(editorState) {
       node: selectedNode.node,
       pos: selectedNode.pos,
       nodeType: selectedNode.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: selectedNode.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -57,8 +53,6 @@ function getSelectedNode(editorState) {
       node: parentNode.node,
       pos: parentNode.pos,
       nodeType: parentNode.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: parentNode.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -69,8 +63,6 @@ function getSelectedNode(editorState) {
     node: $pos.parent,
     pos: $pos.pos,
     nodeType: $pos.parent.type.name,
-    // @ts-ignore - Workaround for help-center local consumption
-
     marks: $pos.marks().map(function (mark) {
       return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
     })
@@ -125,14 +117,12 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
           return new _safePlugin.SafePlugin({
             key: _pluginKey.editorToolbarPluginKey,
             state: {
-              // @ts-ignore - Workaround for help-center local consumption
               init: function init(_, editorState) {
                 return {
                   shouldShowToolbar: false,
                   selectedNode: getSelectedNode(editorState)
                 };
               },
-              // @ts-ignore - Workaround for help-center local consumption
               apply: function apply(tr, pluginState, _, newState) {
                 var meta = tr.getMeta(_pluginKey.editorToolbarPluginKey);
                 var newPluginState = _objectSpread({}, pluginState);
@@ -153,7 +143,6 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
                 return newPluginState;
               }
             },
-            // @ts-ignore - Workaround for help-center local consumption
             view: function view(_view) {
               var unbind = (0, _bindEventListener.bind)(_view.root, {
                 type: 'mouseup',
@@ -182,7 +171,6 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
                 }
               });
               return {
-                // @ts-ignore - Workaround for help-center local consumption
                 destroy: function destroy() {
                   unbind();
                   unbindEditorViewFocus();
@@ -190,11 +178,7 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
               };
             },
             props: {
-              // @ts-ignore - Workaround for help-center local consumption
-
               handleDOMEvents: {
-                // @ts-ignore - Workaround for help-center local consumption
-
                 mousedown: function mousedown(view) {
                   view.dispatch(view.state.tr.setMeta(_pluginKey.editorToolbarPluginKey, {
                     shouldShowToolbar: false

package/dist/cjs/ui/OverflowMenuSection.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.OverflowMenuSection = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _toolbar = require("@atlaskit/editor-common/toolbar");
+var _editorToolbar = require("@atlaskit/editor-toolbar");
+var OverflowMenuSection = exports.OverflowMenuSection = function OverflowMenuSection(_ref) {
+  var children = _ref.children;
+  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+    editorViewMode = _useEditorToolbar.editorViewMode;
+  var isEdit = editorViewMode === 'edit';
+
+  // only show separator in edit mode, when the pinned toolbar option is available
+  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+    hasSeparator: isEdit
+  }, children);
+};

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

@@ -14,6 +14,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _consts = require("./consts");
 var _OverflowMenu = require("./OverflowMenu");
+var _OverflowMenuSection = require("./OverflowMenuSection");
 var _OverflowSection = require("./OverflowSection");
 var _PrimaryToolbar = require("./PrimaryToolbar");
 var _Section = require("./Section");
@@ -217,7 +218,16 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       var children = _ref9.children;
       return /*#__PURE__*/_react.default.createElement(_OverflowMenu.OverflowMenu, null, children);
     }
-  }, {
+  }], (0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_overflow_menu_update') ? [{
+    type: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+    key: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+    parents: [{
+      type: _toolbar.OVERFLOW_MENU.type,
+      key: _toolbar.OVERFLOW_MENU.key,
+      rank: _toolbar.OVERFLOW_MENU_RANK[_toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key]
+    }],
+    component: _OverflowMenuSection.OverflowMenuSection
+  }] : []), [{
     type: _toolbar.PIN_SECTION.type,
     key: _toolbar.PIN_SECTION.key,
     parents: [{

package/dist/es2019/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -57,8 +57,6 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
       onDomMutation: ({
         mutations
       }) => {
-        // @ts-ignore - Workaround for help-center local consumption
-
         if (mutations.some(isSelectionToolbarAddedInMutation)) {
           return {
             status: 'success'
@@ -77,8 +75,6 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
     key: pluginKey,
     state: {
       init: () => ({}),
-      // @ts-ignore - Workaround for help-center local consumption
-
       apply: (_tr, pluginState, oldState, newState) => {
         if (!oldState.selection.empty && isSelectionWithoutTextContent(newState.selection)) {
           experience.abort({
@@ -95,8 +91,6 @@ export const getSelectionToolbarOpenExperiencePlugin = ({
       }
     },
     props: {
-      // @ts-ignore - Workaround for help-center local consumption
-
       handleDOMEvents: {
         mousedown: (_view, e) => {
           mouseDownPos = {
@@ -149,8 +143,6 @@ const isSelectionToolbarAddedInMutation = ({
   type,
   addedNodes
 }) => {
-  // @ts-ignore - Workaround for help-center local consumption
-
   return type === 'childList' && [...addedNodes].some(isSelectionToolbarWithinNode);
 };
 const isSelectionToolbarWithinNode = node => {

package/dist/es2019/toolbarPlugin.js

@@ -21,8 +21,6 @@ function getSelectedNode(editorState) {
       node: selection.node,
       pos: selection.from,
       nodeType: selection.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: selection.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
     };
   }
@@ -35,8 +33,6 @@ function getSelectedNode(editorState) {
       node: selectedNode.node,
       pos: selectedNode.pos,
       nodeType: selectedNode.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: selectedNode.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
     };
   }
@@ -46,8 +42,6 @@ function getSelectedNode(editorState) {
       node: parentNode.node,
       pos: parentNode.pos,
       nodeType: parentNode.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: parentNode.node.marks.map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
     };
   }
@@ -56,8 +50,6 @@ function getSelectedNode(editorState) {
     node: $pos.parent,
     pos: $pos.pos,
     nodeType: $pos.parent.type.name,
-    // @ts-ignore - Workaround for help-center local consumption
-
     marks: $pos.marks().map(mark => `${mark.type.name}:${JSON.stringify(mark.attrs)}`)
   };
 }
@@ -110,16 +102,12 @@ export const toolbarPlugin = ({
           return new SafePlugin({
             key: editorToolbarPluginKey,
             state: {
-              // @ts-ignore - Workaround for help-center local consumption
-
               init(_, editorState) {
                 return {
                   shouldShowToolbar: false,
                   selectedNode: getSelectedNode(editorState)
                 };
               },
-              // @ts-ignore - Workaround for help-center local consumption
-
               apply(tr, pluginState, _, newState) {
                 const meta = tr.getMeta(editorToolbarPluginKey);
                 let newPluginState = {
@@ -145,8 +133,6 @@ export const toolbarPlugin = ({
                 return newPluginState;
               }
             },
-            // @ts-ignore - Workaround for help-center local consumption
-
             view(view) {
               const unbind = bind(view.root, {
                 type: 'mouseup',
@@ -175,8 +161,6 @@ export const toolbarPlugin = ({
                 }
               });
               return {
-                // @ts-ignore - Workaround for help-center local consumption
-
                 destroy() {
                   unbind();
                   unbindEditorViewFocus();
@@ -184,11 +168,7 @@ export const toolbarPlugin = ({
               };
             },
             props: {
-              // @ts-ignore - Workaround for help-center local consumption
-
               handleDOMEvents: {
-                // @ts-ignore - Workaround for help-center local consumption
-
                 mousedown: view => {
                   view.dispatch(view.state.tr.setMeta(editorToolbarPluginKey, {
                     shouldShowToolbar: false

package/dist/es2019/ui/OverflowMenuSection.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+export const OverflowMenuSection = ({
+  children
+}) => {
+  const {
+    editorViewMode
+  } = useEditorToolbar();
+  const isEdit = editorViewMode === 'edit';
+
+  // only show separator in edit mode, when the pinned toolbar option is available
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    hasSeparator: isEdit
+  }, children);
+};

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

@@ -1,11 +1,12 @@
 import React from 'react';
 import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
-import { INSERT_BLOCK_SECTION, LINKING_SECTION, OVERFLOW_GROUP, OVERFLOW_GROUP_PRIMARY_TOOLBAR, OVERFLOW_GROUP_PRIMARY_TOOLBAR_RANK, OVERFLOW_GROUP_RANK, OVERFLOW_MENU, OVERFLOW_MENU_PRIMARY_TOOLBAR, OVERFLOW_SECTION, OVERFLOW_SECTION_PRIMARY_TOOLBAR, OVERFLOW_SECTION_PRIMARY_TOOLBAR_RANK, OVERFLOW_SECTION_RANK, PIN_SECTION, TEXT_COLLAPSED_GROUP, TEXT_SECTION, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_COLLAPSED, TEXT_COLLAPSED_MENU, TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_SECTION } from '@atlaskit/editor-common/toolbar';
+import { INSERT_BLOCK_SECTION, LINKING_SECTION, OVERFLOW_GROUP, OVERFLOW_GROUP_PRIMARY_TOOLBAR, OVERFLOW_GROUP_PRIMARY_TOOLBAR_RANK, OVERFLOW_GROUP_RANK, OVERFLOW_MENU, OVERFLOW_MENU_PRIMARY_TOOLBAR, OVERFLOW_SECTION, OVERFLOW_SECTION_PRIMARY_TOOLBAR, OVERFLOW_SECTION_PRIMARY_TOOLBAR_RANK, OVERFLOW_SECTION_RANK, PIN_SECTION, TEXT_COLLAPSED_GROUP, TEXT_SECTION, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_COLLAPSED, TEXT_COLLAPSED_MENU, TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_MENU_RANK } from '@atlaskit/editor-common/toolbar';
 import { PrimaryToolbar as PrimaryToolbarBase, Show, Toolbar } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { SELECTION_TOOLBAR_LABEL } from './consts';
 import { OverflowMenu } from './OverflowMenu';
+import { OverflowMenuSection } from './OverflowMenuSection';
 import { OverflowSection } from './OverflowSection';
 import { PrimaryToolbar } from './PrimaryToolbar';
 import { Section } from './Section';
@@ -210,7 +211,16 @@ export const getToolbarComponents = (contextualFormattingEnabled, api, disableSe
     }) => {
       return /*#__PURE__*/React.createElement(OverflowMenu, null, children);
     }
-  }, {
+  }, ...(fg('platform_editor_toolbar_aifc_overflow_menu_update') ? [{
+    type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+    key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+    parents: [{
+      type: OVERFLOW_MENU.type,
+      key: OVERFLOW_MENU.key,
+      rank: OVERFLOW_MENU_RANK[OVERFLOW_EXTENSIONS_MENU_SECTION.key]
+    }],
+    component: OverflowMenuSection
+  }] : []), {
     type: PIN_SECTION.type,
     key: PIN_SECTION.key,
     parents: [{

package/dist/esm/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -56,8 +56,6 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
     }), new ExperienceCheckDomMutation({
       onDomMutation: function onDomMutation(_ref2) {
         var mutations = _ref2.mutations;
-        // @ts-ignore - Workaround for help-center local consumption
-
         if (mutations.some(isSelectionToolbarAddedInMutation)) {
           return {
             status: 'success'
@@ -80,8 +78,6 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
       init: function init() {
         return {};
       },
-      // @ts-ignore - Workaround for help-center local consumption
-
       apply: function apply(_tr, pluginState, oldState, newState) {
         if (!oldState.selection.empty && isSelectionWithoutTextContent(newState.selection)) {
           experience.abort({
@@ -98,8 +94,6 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
       }
     },
     props: {
-      // @ts-ignore - Workaround for help-center local consumption
-
       handleDOMEvents: {
         mousedown: function mousedown(_view, e) {
           mouseDownPos = {
@@ -150,8 +144,6 @@ export var getSelectionToolbarOpenExperiencePlugin = function getSelectionToolba
 var isSelectionToolbarAddedInMutation = function isSelectionToolbarAddedInMutation(_ref4) {
   var type = _ref4.type,
     addedNodes = _ref4.addedNodes;
-  // @ts-ignore - Workaround for help-center local consumption
-
   return type === 'childList' && _toConsumableArray(addedNodes).some(isSelectionToolbarWithinNode);
 };
 var isSelectionToolbarWithinNode = function isSelectionToolbarWithinNode(node) {

package/dist/esm/toolbarPlugin.js

@@ -23,8 +23,6 @@ function getSelectedNode(editorState) {
       node: selection.node,
       pos: selection.from,
       nodeType: selection.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: selection.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -37,8 +35,6 @@ function getSelectedNode(editorState) {
       node: selectedNode.node,
       pos: selectedNode.pos,
       nodeType: selectedNode.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: selectedNode.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -50,8 +46,6 @@ function getSelectedNode(editorState) {
       node: parentNode.node,
       pos: parentNode.pos,
       nodeType: parentNode.node.type.name,
-      // @ts-ignore - Workaround for help-center local consumption
-
       marks: parentNode.node.marks.map(function (mark) {
         return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
       })
@@ -62,8 +56,6 @@ function getSelectedNode(editorState) {
     node: $pos.parent,
     pos: $pos.pos,
     nodeType: $pos.parent.type.name,
-    // @ts-ignore - Workaround for help-center local consumption
-
     marks: $pos.marks().map(function (mark) {
       return "".concat(mark.type.name, ":").concat(JSON.stringify(mark.attrs));
     })
@@ -118,14 +110,12 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
           return new SafePlugin({
             key: editorToolbarPluginKey,
             state: {
-              // @ts-ignore - Workaround for help-center local consumption
               init: function init(_, editorState) {
                 return {
                   shouldShowToolbar: false,
                   selectedNode: getSelectedNode(editorState)
                 };
               },
-              // @ts-ignore - Workaround for help-center local consumption
               apply: function apply(tr, pluginState, _, newState) {
                 var meta = tr.getMeta(editorToolbarPluginKey);
                 var newPluginState = _objectSpread({}, pluginState);
@@ -146,7 +136,6 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
                 return newPluginState;
               }
             },
-            // @ts-ignore - Workaround for help-center local consumption
             view: function view(_view) {
               var unbind = bind(_view.root, {
                 type: 'mouseup',
@@ -175,7 +164,6 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
                 }
               });
               return {
-                // @ts-ignore - Workaround for help-center local consumption
                 destroy: function destroy() {
                   unbind();
                   unbindEditorViewFocus();
@@ -183,11 +171,7 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
               };
             },
             props: {
-              // @ts-ignore - Workaround for help-center local consumption
-
               handleDOMEvents: {
-                // @ts-ignore - Workaround for help-center local consumption
-
                 mousedown: function mousedown(view) {
                   view.dispatch(view.state.tr.setMeta(editorToolbarPluginKey, {
                     shouldShowToolbar: false

package/dist/esm/ui/OverflowMenuSection.js

@@ -0,0 +1,14 @@
+import React from 'react';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+export var OverflowMenuSection = function OverflowMenuSection(_ref) {
+  var children = _ref.children;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorViewMode = _useEditorToolbar.editorViewMode;
+  var isEdit = editorViewMode === 'edit';
+
+  // only show separator in edit mode, when the pinned toolbar option is available
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    hasSeparator: isEdit
+  }, children);
+};

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

@@ -1,12 +1,13 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import React from 'react';
 import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
-import { INSERT_BLOCK_SECTION, LINKING_SECTION, OVERFLOW_GROUP, OVERFLOW_GROUP_PRIMARY_TOOLBAR, OVERFLOW_GROUP_PRIMARY_TOOLBAR_RANK, OVERFLOW_GROUP_RANK, OVERFLOW_MENU, OVERFLOW_MENU_PRIMARY_TOOLBAR, OVERFLOW_SECTION, OVERFLOW_SECTION_PRIMARY_TOOLBAR, OVERFLOW_SECTION_PRIMARY_TOOLBAR_RANK, OVERFLOW_SECTION_RANK, PIN_SECTION, TEXT_COLLAPSED_GROUP, TEXT_SECTION, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_COLLAPSED, TEXT_COLLAPSED_MENU, TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_SECTION } from '@atlaskit/editor-common/toolbar';
+import { INSERT_BLOCK_SECTION, LINKING_SECTION, OVERFLOW_GROUP, OVERFLOW_GROUP_PRIMARY_TOOLBAR, OVERFLOW_GROUP_PRIMARY_TOOLBAR_RANK, OVERFLOW_GROUP_RANK, OVERFLOW_MENU, OVERFLOW_MENU_PRIMARY_TOOLBAR, OVERFLOW_SECTION, OVERFLOW_SECTION_PRIMARY_TOOLBAR, OVERFLOW_SECTION_PRIMARY_TOOLBAR_RANK, OVERFLOW_SECTION_RANK, PIN_SECTION, TEXT_COLLAPSED_GROUP, TEXT_SECTION, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_COLLAPSED, TEXT_COLLAPSED_MENU, TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_MENU_RANK } from '@atlaskit/editor-common/toolbar';
 import { PrimaryToolbar as PrimaryToolbarBase, Show, Toolbar } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { SELECTION_TOOLBAR_LABEL } from './consts';
 import { OverflowMenu } from './OverflowMenu';
+import { OverflowMenuSection } from './OverflowMenuSection';
 import { OverflowSection } from './OverflowSection';
 import { PrimaryToolbar } from './PrimaryToolbar';
 import { Section } from './Section';
@@ -210,7 +211,16 @@ export var getToolbarComponents = function getToolbarComponents(contextualFormat
       var children = _ref9.children;
       return /*#__PURE__*/React.createElement(OverflowMenu, null, children);
     }
-  }, {
+  }], _toConsumableArray(fg('platform_editor_toolbar_aifc_overflow_menu_update') ? [{
+    type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+    key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+    parents: [{
+      type: OVERFLOW_MENU.type,
+      key: OVERFLOW_MENU.key,
+      rank: OVERFLOW_MENU_RANK[OVERFLOW_EXTENSIONS_MENU_SECTION.key]
+    }],
+    component: OverflowMenuSection
+  }] : []), [{
     type: PIN_SECTION.type,
     key: PIN_SECTION.key,
     parents: [{

package/dist/types/ui/OverflowMenuSection.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+type OverflowMenuSectionProps = {
+    children: React.ReactNode;
+};
+export declare const OverflowMenuSection: ({ children }: OverflowMenuSectionProps) => React.JSX.Element;
+export {};

package/dist/types-ts4.5/ui/OverflowMenuSection.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+type OverflowMenuSectionProps = {
+    children: React.ReactNode;
+};
+export declare const OverflowMenuSection: ({ children }: OverflowMenuSectionProps) => React.JSX.Element;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "3.4.14",
+	"version": "3.4.16",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,13 +40,13 @@
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
-		"@atlaskit/tmp-editor-statsig": "^14.1.0",
+		"@atlaskit/tmp-editor-statsig": "^14.8.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": "^110.36.0",
+		"@atlaskit/editor-common": "^110.40.0",
 		"react": "^18.2.0"
 	},
 	"platform-feature-flags": {
@@ -64,6 +64,9 @@
 		},
 		"platform_editor_toolbar_aifc_undo_redo_confluence": {
 			"type": "boolean"
+		},
+		"platform_editor_toolbar_aifc_overflow_menu_update": {
+			"type": "boolean"
 		}
 	},
 	"techstack": {