diff --git a/ui/src/components/btn/QBtn.js b/ui/src/components/btn/QBtn.js index c494236ea13..fed78614098 100644 --- a/ui/src/components/btn/QBtn.js +++ b/ui/src/components/btn/QBtn.js @@ -302,7 +302,7 @@ export default createComponent({ props.icon !== void 0 && inner.push( h(QIcon, { name: props.icon, - left: props.stack !== true && hasLabel.value === true, + left: props.stack !== true && (hasLabel.value === true || slots.label !== undefined), role: 'img' }) ) @@ -317,7 +317,7 @@ export default createComponent({ inner.push( h(QIcon, { name: props.iconRight, - right: props.stack !== true && hasLabel.value === true, + right: props.stack !== true && (hasLabel.value === true || slots.label !== undefined), role: 'img' }) ) diff --git a/ui/src/components/icon/QIcon.js b/ui/src/components/icon/QIcon.js index 645a583a613..a2f91426820 100644 --- a/ui/src/components/icon/QIcon.js +++ b/ui/src/components/icon/QIcon.js @@ -186,7 +186,7 @@ export default createComponent({ const data = { class: classes.value, style: sizeStyle.value, - 'aria-hidden': 'true', + 'aria-hidden': 'true' } if (type.value.none === true) {