Merge pull request #5226 from nextcloud/bugfix/5220

fix: Prioritize un-collapsible menubar entries for mobile and aggregate children in the hidden entries

src/components/Menu/MenuBar.vue

@@ -161,14 +161,20 @@ export default {
 			return list
 		},
 		hiddenEntries() {
+			const entries = this.entries.filter(({ priority }) => {
+				// reverse logic from visibleEntries
+				return priority !== undefined && priority > this.iconsLimit
+			}).reduce((acc, entry) => {
+				// If entry has children, merge them into list. Otherwise keep entry itself.
+				const children = entry.children ?? [entry]
+				return [...acc, ...children]
+			}, [])
+
 			return {
 				key: 'remain',
 				label: this.t('text', 'Remaining actions'),
 				icon: DotsHorizontal,
-				children: this.entries.filter(({ priority }) => {
-					// reverse logic from visibleEntries
-					return priority !== undefined && priority > this.iconsLimit
-				}),
+				children: entries,
 			}
 		},
 	},

src/components/Menu/entries.js

@@ -308,7 +308,7 @@ export default [
 				},
 			},
 		],
-		priority: 3,
+		priority: 6,
 	},
 	{
 		key: 'code-block',
@@ -340,13 +340,13 @@ export default [
 		action: (command, emojiObject = {}) => {
 			return command.emoji(emojiObject)
 		},
-		priority: 5,
+		priority: 3,
 	},
 	{
 		key: 'insert-attachment',
 		label: t('text', 'Insert attachment'),
 		icon: Images,
 		component: ActionAttachmentUpload,
-		priority: 4,
+		priority: 1,
 	},
 ]