fix(QSpinner/...): JSON structure; JSON > "size" type definition

quasarframework · May 3, 2024 · 3af7616 · 3af7616
1 parent 8452447
commit 3af7616
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ui/src/components/spinner/QSpinner.json b/ui/src/components/spinner/QSpinner.json
@@ -1,15 +1,11 @@
 {
-  "mixins": [ "composables/private.use-size/use-size" ],
+  "mixins": [ "components/spinner/spinner" ],
 
   "meta": {
     "docsUrl": "https://v2.quasar.dev/vue-components/spinners"
   },
 
   "props": {
-    "color": {
-      "extends": "color"
-    },
-
     "thickness": {
       "type": "Number",
       "desc": "Override value to use for stroke-width",

diff --git a/ui/src/components/spinner/spinner.json b/ui/src/components/spinner/spinner.json
@@ -8,6 +8,11 @@
   "props": {
     "color": {
       "extends": "color"
+    },
+
+    "size": {
+      "type": [ "String", "Number" ],
+      "default": "'1em'"
     }
   }
 }
diff --git a/ui/src/components/spinner/use-spinner.js b/ui/src/components/spinner/use-spinner.js
@@ -3,7 +3,7 @@ import { useSizeDefaults } from '../../composables/private.use-size/use-size.js'
 
 export const useSpinnerProps = {
   size: {
-    type: [ Number, String ],
+    type: [ String, Number ],
     default: '1em'
   },
   color: String