Skip to content

Commit 4e4250d

Browse files
committed
fix: adjust loader parser
1 parent faa77d5 commit 4e4250d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/components/Circle/Circle.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</circle>
5151
<fade-in-transition>
5252
<g v-if="isLoading">
53-
<circle-loader :options="options.loader" />
53+
<circle-loader :options="{ ...options, ...options.loader }" />
5454
</g>
5555
</fade-in-transition>
5656
<circle

src/components/optionsParser.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ export const linePositionParser = (linePosition) => {
6262
};
6363
};
6464

65-
export const loaderParser = (loader) => ({
65+
export const loaderParser = (loader, circleLineMode, circleThickness, circleSize) => ({
6666
...loader,
67-
lineMode: loader.lineMode ? lineModeParser(loader.lineMode) : undefined,
68-
thickness: loader.thickness ? calcThickness(loader.thickness) : undefined,
67+
lineMode: lineModeParser(loader.lineMode || circleLineMode, false),
68+
thickness: calcThickness(loader.thickness || circleThickness, circleSize),
6969
});
7070

7171
export const parseOptions = (options) => ({
@@ -80,5 +80,5 @@ export const parseOptions = (options) => ({
8080
linePosition: linePositionParser(options.linePosition),
8181
emptyLinePosition: linePositionParser(options.emptyLinePosition),
8282
animation: animationParser(options.animation),
83-
loader: loaderParser(options.loader),
83+
loader: loaderParser(options.loader, options.lineMode, options.thickness, options.size),
8484
});

0 commit comments

Comments
 (0)