feat(ui): various small improvements

quasarframework · Feb 10, 2022 · 7d9ab19 · 7d9ab19
1 parent 7dfca62
commit 7d9ab19
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/ui/src/api.extends.json b/ui/src/api.extends.json
@@ -47,7 +47,7 @@
 
     "icon": {
       "type": "String",
-      "desc": "Icon name following Quasar convention; Make sure you have the icon library installed unless you are using 'img:' prefix",
+      "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)",
       "examples": [
         "map",
         "ion-add",

diff --git a/ui/src/components/icon/QIcon.js b/ui/src/components/icon/QIcon.js
@@ -69,7 +69,7 @@ export default createComponent({
       let cls
       let icon = props.name
 
-      if (!icon || icon === 'none') {
+      if (icon === 'none' || !icon) {
         return { none: true }
       }
 
@@ -78,7 +78,7 @@ export default createComponent({
         if (res !== void 0) {
           if (res.icon !== void 0) {
             icon = res.icon
-            if (icon === 'none') {
+            if (icon === 'none' || !icon) {
               return { none: true }
             }
           }

diff --git a/ui/src/components/icon/QIcon.json b/ui/src/components/icon/QIcon.json
@@ -14,9 +14,7 @@
     },
 
     "name": {
-      "type": "String",
-      "desc": "Name of the icon, following Quasar convention",
-      "examples": [ "map", "ion-add" ],
+      "extends": "icon",
       "category": "model"
     },
 

diff --git a/ui/src/components/stepper/QStep.json b/ui/src/components/stepper/QStep.json
@@ -45,6 +45,7 @@
 
     "done-icon": {
       "extends": "icon",
+      "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",
       "category": "header"
     },
 
@@ -55,6 +56,7 @@
 
     "active-icon": {
       "extends": "icon",
+      "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",
       "category": "header"
     },
 
@@ -65,6 +67,7 @@
 
     "error-icon": {
       "extends": "icon",
+      "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",
       "category": "header"
     },
 

diff --git a/ui/src/components/stepper/StepHeader.js b/ui/src/components/stepper/StepHeader.js
@@ -104,7 +104,7 @@ export default createComponent({
       return 'q-stepper__tab col-grow flex items-center no-wrap relative-position'
         + (color.value !== void 0 ? ` text-${ color.value }` : '')
         + (isError.value === true
-          ? ' q-stepper__tab--error q-stepper__tab--error-with-' + (hasPrefix.value ? 'prefix' : 'icon')
+          ? ' q-stepper__tab--error q-stepper__tab--error-with-' + (hasPrefix.value === true ? 'prefix' : 'icon')
           : '')
         + (isActive.value === true ? ' q-stepper__tab--active' : '')
         + (isDone.value === true ? ' q-stepper__tab--done' : '')

diff --git a/ui/src/utils/extend.js b/ui/src/utils/extend.js
@@ -44,7 +44,7 @@ export default function extend () {
 
           target[ name ] = extend(deep, clone, copy)
         }
-        else if (copy !== undefined) {
+        else if (copy !== void 0) {
           target[ name ] = copy
         }
       }