fix: adjust loader parser

setaman · Jan 5, 2021 · 4e4250d · 4e4250d
1 parent faa77d5
commit 4e4250d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/components/Circle/Circle.vue b/src/components/Circle/Circle.vue
@@ -50,7 +50,7 @@
     </circle>
     <fade-in-transition>
       <g v-if="isLoading">
-        <circle-loader :options="options.loader" />
+        <circle-loader :options="{ ...options, ...options.loader }" />
       </g>
     </fade-in-transition>
     <circle

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