Merge pull request #1879 from nextcloud/bugfix/noid/fix-class-fallbac…

…k-with-defined-slot Fix first-action icon class not showing when Actions icon-slot is def…
nextcloud-libraries · Apr 27, 2021 · c241516 · c241516
2 parents c4c8ee4 + e7d9e5f
commit c241516
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/components/Actions/Actions.vue b/src/components/Actions/Actions.vue
@@ -139,8 +139,8 @@ export default {
 		v-tooltip.auto="firstAction.text"
 		v-bind="firstActionBinding"
 		:class="{
-			[firstAction.icon]: !iconSlotIsPopulated ,
-			[firstActionClass]: !iconSlotIsPopulated }"
+			[firstAction.icon]: firstAction.icon,
+			[firstActionClass]: firstActionClass }"
 		class="action-item action-item--single"
 		rel="noreferrer noopener"
 		:disabled="disabled"
@@ -459,7 +459,7 @@ export default {
 		firstActionClass() {
 			const staticClass = this.firstActionVNode && this.firstActionVNode.data.staticClass
 			const dynClass = this.firstActionVNode && this.firstActionVNode.data.class
-			return `${staticClass} ${dynClass}`
+			return (staticClass + ' ' + dynClass).trim()
 		},
 
 		iconSlotIsPopulated() {