@atlaskit/editor-plugin-toolbar 3.4.15 → 3.4.16

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @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

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/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/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.15",
+	"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.2.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": {