feat(menu): Group block elements in a submenu

Contributes to: #2836

Signed-off-by: Jonas <jonas@freesources.org>

cypress/e2e/workspace.spec.js

@@ -194,15 +194,15 @@ describe('Workspace', function() {
 				const actionName = `callout-${type}`
 
 				// enable callout
-				cy.getSubmenuEntry('callouts', actionName).click()
+				cy.getSubmenuEntry('blocks', actionName).click()
 
 				// check content
 				cy.getContent()
 					.find(`.callout.callout--${type}`)
 					.should('contain', 'Callout')
 
 				// disable
-				cy.getSubmenuEntry('callouts', actionName)
+				cy.getSubmenuEntry('blocks', actionName)
 					.should('have.class', 'is-active')
 					.click()
 			})
@@ -212,19 +212,19 @@ describe('Workspace', function() {
 			const [first, ...rest] = types
 
 			// enable callout
-			cy.getSubmenuEntry('callouts', `callout-${first}`)
+			cy.getSubmenuEntry('blocks', `callout-${first}`)
 				.click()
 
 			cy.wrap(rest).each(type => {
 				const actionName = `callout-${type}`
-				cy.getSubmenuEntry('callouts', actionName).click()
+				cy.getSubmenuEntry('blocks', actionName).click()
 				cy.getContent().find(`.callout.callout--${type}`)
 					.should('contain', 'Callout')
 			})
 
-			cy.getSubmenuEntry('callouts', `callout-${rest.at(-1)}`)
+			cy.getSubmenuEntry('blocks', `callout-${rest.at(-1)}`)
 				.click()
-			cy.getMenuEntry('callouts')
+			cy.getMenuEntry('blocks')
 				.should('not.have.class', 'is-active')
 		})
 	})

src/components/Menu/ActionList.vue

@@ -103,7 +103,7 @@ export default {
 		},
 		labelWithSelected() {
 			if (this.currentChild) {
-				// TRANSLATORS: examples - Headings, "Heading 1" is selected - Callouts, "Info" is selected
+				// TRANSLATORS: examples - Headings, "Heading 1" is selected - Blocks, "Info callout" is selected
 				return t('text', '{menuItemName}, "{selectedSubMenuItemName}" is selected', {
 					menuItemName: this.actionEntry.label,
 					selectedSubMenuItemName: this.currentChild.label,

src/components/Menu/entries.js

@@ -6,6 +6,7 @@
 import {
 	Undo,
 	Redo,
+	CardTextOutline,
 	CodeTags,
 	Danger,
 	Emoticon,
@@ -59,7 +60,7 @@ export default [
 		keyModifiers: [MODIFIERS.Mod],
 		icon: Undo,
 		action: (command) => command.undo(),
-		priority: 7,
+		priority: 8,
 	},
 	{
 		key: 'redo',
@@ -68,7 +69,7 @@ export default [
 		keyModifiers: [MODIFIERS.Mod],
 		icon: Redo,
 		action: (command) => command.redo(),
-		priority: 10,
+		priority: 11,
 	},
 	{
 		key: 'bold',
@@ -80,7 +81,7 @@ export default [
 		action: (command) => {
 			return command.toggleBold()
 		},
-		priority: 8,
+		priority: 9,
 	},
 	{
 		key: 'italic',
@@ -92,7 +93,7 @@ export default [
 		action: (command) => {
 			return command.toggleItalic()
 		},
-		priority: 9,
+		priority: 10,
 	},
 	{
 		key: 'underline',
@@ -104,7 +105,7 @@ export default [
 		action: (command) => {
 			return command.toggleUnderline()
 		},
-		priority: 13,
+		priority: 12,
 	},
 	{
 		key: 'strikethrough',
@@ -116,7 +117,7 @@ export default [
 		action: (command) => {
 			return command.toggleStrike()
 		},
-		priority: 14,
+		priority: 13,
 	},
 	{
 		key: 'headings',
@@ -132,7 +133,7 @@ export default [
 				keyChar: '1',
 				keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
 				icon: FormatHeader1,
-				isActive: ['heading', { level: 1 }],
+				isActive: { name: 'heading', attributes: { level: 1 } },
 				action: (command) => {
 					return command.toggleHeading({ level: 1 })
 				},
@@ -143,7 +144,7 @@ export default [
 				keyChar: '2',
 				keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
 				icon: FormatHeader2,
-				isActive: ['heading', { level: 2 }],
+				isActive: { name: 'heading', attributes: { level: 2 } },
 				action: (command) => {
 					return command.toggleHeading({ level: 2 })
 				},
@@ -154,7 +155,7 @@ export default [
 				keyChar: '3',
 				keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
 				icon: FormatHeader3,
-				isActive: ['heading', { level: 3 }],
+				isActive: { name: 'heading', attributes: { level: 3 } },
 				action: (command) => {
 					return command.toggleHeading({ level: 3 })
 				},
@@ -164,7 +165,7 @@ export default [
 				label: t('text', 'Heading 4'),
 				keyChar: '4',
 				keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
-				isActive: ['heading', { level: 4 }],
+				isActive: { name: 'heading', attributes: { level: 4 } },
 				icon: FormatHeader4,
 				action: (command) => {
 					return command.toggleHeading({ level: 4 })
@@ -175,7 +176,7 @@ export default [
 				label: t('text', 'Heading 5'),
 				keyChar: '5',
 				keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
-				isActive: ['heading', { level: 5 }],
+				isActive: { name: 'heading', attributes: { level: 5 } },
 				icon: FormatHeader5,
 				action: (command) => {
 					return command.toggleHeading({ level: 5 })
@@ -186,7 +187,7 @@ export default [
 				label: t('text', 'Heading 6'),
 				keyChar: '6',
 				keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
-				isActive: ['heading', { level: 6 }],
+				isActive: { name: 'heading', attributes: { level: 6 } },
 				icon: FormatHeader6,
 				action: (command) => {
 					return command.toggleHeading({ level: 6 })
@@ -220,7 +221,7 @@ export default [
 		label: t('text', 'Lists'),
 		keyChar: '7…9',
 		keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
-		isActive: [{ isList: true }],
+		isActive: ['bulletList', 'orderedList', 'taskList'],
 		icon: FormatListBulleted,
 		children: [
 			{
@@ -287,82 +288,76 @@ export default [
 		priority: 2,
 	},
 	{
-		key: 'insert-link',
-		label: t('text', 'Insert link'),
-		isActive: 'link',
-		icon: LinkIcon,
-		component: ActionInsertLink,
-		priority: 3,
-	},
-	{
-		key: 'blockquote',
-		label: t('text', 'Blockquote'),
-		keyChar: 'b',
-		keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
-		isActive: 'blockquote',
-		icon: FormatQuote,
-		action: (command) => {
-			return command.toggleBlockquote()
-		},
-		priority: 11,
-	},
-	{
-		key: 'callouts',
-		label: t('text', 'Callouts'),
+		key: 'blocks',
+		label: t('text', 'Blocks'),
 		visible: false,
-		icon: Info,
-		isActive: 'callout',
+		icon: CardTextOutline,
+		isActive: ['blockquote', 'codeBlock', 'callout'],
 		children: [
+			{
+				key: 'blockquote',
+				label: t('text', 'Blockquote'),
+				keyChar: 'b',
+				keyModifiers: [MODIFIERS.Mod, MODIFIERS.Shift],
+				isActive: 'blockquote',
+				icon: FormatQuote,
+				action: (command) => {
+					return command.toggleBlockquote()
+				},
+			},
+			{
+				key: 'code-block',
+				label: t('text', 'Code block'),
+				keyChar: 'c',
+				keyModifiers: [MODIFIERS.Mod, MODIFIERS.Alt],
+				isActive: 'codeBlock',
+				icon: CodeTags,
+				action: (command) => {
+					return command.toggleCodeBlock()
+				},
+			},
+			{
+				key: 'blocks-separator',
+				isSeparator: true,
+			},
 			{
 				key: 'callout-info',
-				label: t('text', 'Info'),
-				isActive: ['callout', { type: 'info' }],
+				label: t('text', 'Info call-out'),
+				isActive: { name: 'callout', attributes: { type: 'info' } },
 				icon: Info,
 				action: (command) => {
 					return command.toggleCallout({ type: 'info' })
 				},
 			},
 			{
 				key: 'callout-success',
-				label: t('text', 'Success'),
-				isActive: ['callout', { type: 'success' }],
+				label: t('text', 'Success call-out'),
+				isActive: { name: 'callout', attributes: { type: 'success' } },
 				icon: Positive,
 				action: (command) => {
 					return command.toggleCallout({ type: 'success' })
 				},
 			},
 			{
 				key: 'callout-warn',
-				label: t('text', 'Warning'),
-				isActive: ['callout', { type: 'warn' }],
+				label: t('text', 'Warning call-out'),
+				isActive: { name: 'callout', attributes: { type: 'warn' } },
 				icon: Warn,
 				action: (command) => {
 					return command.toggleCallout({ type: 'warn' })
 				},
 			},
 			{
 				key: 'callout-error',
-				label: t('text', 'Danger'),
-				isActive: ['callout', { type: 'error' }],
+				label: t('text', 'Danger callout'),
+				isActive: { name: 'callout', attributes: { type: 'error' } },
 				icon: Danger,
 				action: (command) => {
 					return command.toggleCallout({ type: 'error' })
 				},
 			},
 		],
-		priority: 4,
-	},
-	{
-		key: 'code-block',
-		label: t('text', 'Code block'),
-		keyChar: 'c',
-		keyModifiers: [MODIFIERS.Mod, MODIFIERS.Alt],
-		isActive: 'codeBlock',
-		icon: CodeTags,
-		action: (command) => {
-			return command.toggleCodeBlock()
-		},
-		priority: 12,
+		priority: 3,
 	},
 	{
 		key: 'table',
@@ -372,7 +367,15 @@ export default [
 		action: (command) => {
 			return command.insertTable()
 		},
-		priority: 15,
+		priority: 4,
+	},
+	{
+		key: 'insert-link',
+		label: t('text', 'Insert link'),
+		isActive: 'link',
+		icon: LinkIcon,
+		component: ActionInsertLink,
+		priority: 5,
 	},
 	{
 		key: 'details',
@@ -382,7 +385,7 @@ export default [
 		action: (command) => {
 			return command.toggleDetails()
 		},
-		priority: 16,
+		priority: 14,
 	},
 	{
 		key: 'emoji-picker',
@@ -392,13 +395,13 @@ export default [
 		action: (command, emojiObject = {}) => {
 			return command.emoji(emojiObject)
 		},
-		priority: 5,
+		priority: 6,
 	},
 	{
 		key: 'insert-attachment',
 		label: t('text', 'Insert attachment'),
 		icon: Paperclip,
 		component: ActionAttachmentUpload,
-		priority: 6,
+		priority: 7,
 	},
 ]

src/components/Suggestion/LinkPicker/suggestions.js

@@ -65,7 +65,7 @@ const formattingSuggestions = (query) => {
 			...menuEntries.find(e => e.key === 'headings').children,
 			...menuEntries.find(e => e.key === 'lists').children,
 			...menuEntries.filter(e => e.action && !filterOut(e)),
-			...menuEntries.find(e => e.key === 'callouts').children,
+			...menuEntries.find(e => e.key === 'blocks').children,
 			{
 				...menuEntries.find(e => e.key === 'emoji-picker'),
 				action: (command) => command.insertContent(':'),

src/components/icons.js

@@ -6,6 +6,7 @@
 /* eslint-disable camelcase */
 
 import MDI_AlphabeticalVariant from 'vue-material-design-icons/AlphabeticalVariant.vue'
+import MDI_CardTextOutline from 'vue-material-design-icons/CardTextOutline.vue'
 import MDI_Close from 'vue-material-design-icons/Close.vue'
 import MDI_Check from 'vue-material-design-icons/Check.vue'
 import MDI_CircleMedium from 'vue-material-design-icons/CircleMedium.vue'
@@ -90,6 +91,7 @@ export const AlphabeticalVariant = makeIcon(MDI_AlphabeticalVariant)
 export const AlignHorizontalCenter = makeIcon(MDI_AlignHorizontalCenter)
 export const AlignHorizontalLeft = makeIcon(MDI_AlignHorizontalLeft)
 export const AlignHorizontalRight = makeIcon(MDI_AlignHorizontalRight)
+export const CardTextOutline = makeIcon(MDI_CardTextOutline)
 export const Close = makeIcon(MDI_Close)
 export const Check = makeIcon(MDI_Check)
 export const CodeTags = makeIcon(MDI_CodeTags)