fix: add loader parser

setaman · Jan 5, 2021 · faa77d5 · faa77d5
1 parent 6303f82
commit faa77d5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -38,14 +38,7 @@
         <input type="checkbox" v-model="circles[3].loading" />
       </div>-->
       <div style="border: 1px solid red; display: inline-block">
-        <ve-progress
-          :progress="progress"
-          :loading="loading"
-          :thickness="10"
-          :empty-thickness="20"
-          line-mode="center"
-          :loader="{ thickness: 20, color: 'green', lineMode: 'in 0', opacity: '0.6' }"
-        >
+        <ve-progress :progress="progress" :loading="loading" :thickness="10" :empty-thickness="20" line-mode="center">
         </ve-progress>
       </div>
       <ve-progress

diff --git a/src/components/VueEllipseProgress.vue b/src/components/VueEllipseProgress.vue
@@ -39,7 +39,7 @@ import { getNumberIfValid, isValidNumber } from "../utils";
 import props from "./interface";
 import CircleContainer from "./Circle/CircleContainer.vue";
 import Counter from "./Counter.vue";
-import { parseOptions, calcThickness, lineModeParser } from "./optionsParser";
+import { parseOptions } from "./optionsParser";
 
 export default {
   name: "VueEllipseProgress",
@@ -90,12 +90,7 @@ export default {
           globalThickness: this.thickness,
           previousCircles: [...previousCircles],
         });
-        const loaderOptions = { ...parsedOptions, ...parsedOptions.loader };
-        loaderOptions.thickness = calcThickness(loaderOptions.thickness, parsedOptions.size);
-        loaderOptions.lineMode = parsedOptions.loader.lineMode
-          ? lineModeParser(loaderOptions.lineMode)
-          : parsedOptions.lineMode;
-        normalizedCircles.push({ ...parsedOptions, loader: loaderOptions });
+        normalizedCircles.push(parsedOptions);
         const { gap, thickness, dot } = normalizedCircles[i];
         previousCircles.push({ gap, thickness, dot });
       }

diff --git a/src/components/optionsParser.js b/src/components/optionsParser.js
@@ -62,6 +62,12 @@ export const linePositionParser = (linePosition) => {
   };
 };
 
+export const loaderParser = (loader) => ({
+  ...loader,
+  lineMode: loader.lineMode ? lineModeParser(loader.lineMode) : undefined,
+  thickness: loader.thickness ? calcThickness(loader.thickness) : undefined,
+});
+
 export const parseOptions = (options) => ({
   ...options,
   thickness: calcThickness(options.thickness, options.size),
@@ -74,4 +80,5 @@ export const parseOptions = (options) => ({
   linePosition: linePositionParser(options.linePosition),
   emptyLinePosition: linePositionParser(options.emptyLinePosition),
   animation: animationParser(options.animation),
+  loader: loaderParser(options.loader),
 });