fix: loader prop validation

setaman · Dec 27, 2020 · ee378a7 · ee378a7
1 parent 9c0347b
commit ee378a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -42,8 +42,9 @@
           :size="200"
           :progress="progress"
           :thickness="10"
+          :loading="loading"
           :color-fill="emptyColorFill"
-          dash="strict 60 0.5"
+          :loader="{ opacity: '1' }"
           :empty-thickness="10"
         >
           <template v-slot:default="{ counterTick }">

diff --git a/src/components/interface.js b/src/components/interface.js
@@ -1,3 +1,5 @@
+import { isValidNumber } from "@/utils";
+
 const colorConfig = (defaultColor = "transparent") => ({
   type: [String, Object],
   required: false,
@@ -14,7 +16,12 @@ const colorConfig = (defaultColor = "transparent") => ({
 });
 
 const validateLoaderProps = (loaderOptions) =>
-  Object.keys(loaderOptions).every((option) => options[option].validator(loaderOptions[option]));
+  Object.keys(loaderOptions).every((option) => {
+    if (option === "opacity") {
+      return isValidNumber(loaderOptions[option] && loaderOptions[option] >= 0);
+    }
+    return options[option].validator(loaderOptions[option]);
+  });
 
 const linePosition = {
   type: String,