Skip to content

Commit 7d9ab19

Browse files
committed
feat(ui): various small improvements
1 parent 7dfca62 commit 7d9ab19

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

ui/src/api.extends.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
"icon": {
4949
"type": "String",
50-
"desc": "Icon name following Quasar convention; Make sure you have the icon library installed unless you are using 'img:' prefix",
50+
"desc": "Icon name following Quasar convention; Make sure you have the icon library installed unless you are using 'img:' prefix; If 'none' (String) is used as value then no icon is rendered (but screen real estate will still be used for it)",
5151
"examples": [
5252
"map",
5353
"ion-add",

ui/src/components/icon/QIcon.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default createComponent({
6969
let cls
7070
let icon = props.name
7171

72-
if (!icon || icon === 'none') {
72+
if (icon === 'none' || !icon) {
7373
return { none: true }
7474
}
7575

@@ -78,7 +78,7 @@ export default createComponent({
7878
if (res !== void 0) {
7979
if (res.icon !== void 0) {
8080
icon = res.icon
81-
if (icon === 'none') {
81+
if (icon === 'none' || !icon) {
8282
return { none: true }
8383
}
8484
}

ui/src/components/icon/QIcon.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
},
1515

1616
"name": {
17-
"type": "String",
18-
"desc": "Name of the icon, following Quasar convention",
19-
"examples": [ "map", "ion-add" ],
17+
"extends": "icon",
2018
"category": "model"
2119
},
2220

ui/src/components/stepper/QStep.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
"done-icon": {
4747
"extends": "icon",
48+
"desc": "Icon name following Quasar convention; If 'none' (String) is used as value, then it will defer to prefix or the regular icon for this state; Make sure you have the icon library installed unless you are using 'img:' prefix",
4849
"category": "header"
4950
},
5051

@@ -55,6 +56,7 @@
5556

5657
"active-icon": {
5758
"extends": "icon",
59+
"desc": "Icon name following Quasar convention; If 'none' (String) is used as value, then it will defer to prefix or the regular icon for this state; Make sure you have the icon library installed unless you are using 'img:' prefix",
5860
"category": "header"
5961
},
6062

@@ -65,6 +67,7 @@
6567

6668
"error-icon": {
6769
"extends": "icon",
70+
"desc": "Icon name following Quasar convention; If 'none' (String) is used as value, then it will defer to prefix or the regular icon for this state; Make sure you have the icon library installed unless you are using 'img:' prefix",
6871
"category": "header"
6972
},
7073

ui/src/components/stepper/StepHeader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export default createComponent({
104104
return 'q-stepper__tab col-grow flex items-center no-wrap relative-position'
105105
+ (color.value !== void 0 ? ` text-${ color.value }` : '')
106106
+ (isError.value === true
107-
? ' q-stepper__tab--error q-stepper__tab--error-with-' + (hasPrefix.value ? 'prefix' : 'icon')
107+
? ' q-stepper__tab--error q-stepper__tab--error-with-' + (hasPrefix.value === true ? 'prefix' : 'icon')
108108
: '')
109109
+ (isActive.value === true ? ' q-stepper__tab--active' : '')
110110
+ (isDone.value === true ? ' q-stepper__tab--done' : '')

ui/src/utils/extend.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default function extend () {
4444

4545
target[ name ] = extend(deep, clone, copy)
4646
}
47-
else if (copy !== undefined) {
47+
else if (copy !== void 0) {
4848
target[ name ] = copy
4949
}
5050
}

0 commit comments

Comments
 (0)