Skip to content

Commit

Permalink
Merge branch 'develop' into bug/computed_class
Browse files Browse the repository at this point in the history
  • Loading branch information
mlmoravek committed Feb 1, 2024
2 parents 9d92bdb + 68e4dee commit f41794a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions packages/oruga-next/src/components/carousel/Carousel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ function onNext(): void {
}
function switchTo(index: number, onlyMove?: boolean): void {
if (settings.value.repeat) index = mod(index, total.value + 1);
if (settings.value.repeat) index = mod(index, total.value);
index = bound(index, 0, total.value);
scrollIndex.value = index;
Expand Down Expand Up @@ -411,8 +411,7 @@ function startTimer(): void {
if (!props.autoplay || timer.value) return;
isPaused.value = false;
timer.value = setInterval(() => {
if (!props.repeat && activeIndex.value >= childItems.value.length - 1)
pauseTimer();
if (!props.repeat && !hasNext.value) pauseTimer();
else onNext();
}, props.interval);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ onBeforeMount(() => {
const bottomClasses = getActiveClasses(positionBottomClasses.value);
parentTop.value = container.value.querySelector(
`&>.${rootClasses.join(".")}.${topClasses.join(".")}`,
`.${rootClasses.join(".")}.${topClasses.join(".")}`,
);
parentBottom.value = container.value.querySelector(
`&>.${rootClasses.join(".")}.${bottomClasses.join(".")}`,
`.${rootClasses.join(".")}.${bottomClasses.join(".")}`,
);
if (parentTop.value && parentBottom.value) return;
Expand Down
2 changes: 1 addition & 1 deletion packages/oruga-next/src/components/taginput/Taginput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ const counterClasses = defineClasses(["counterClass", "o-taginput__counter"]);
</slot>

<o-autocomplete
v-if="hasInput"
v-show="hasInput"
ref="autocompleteRef"
v-model="newItem"
v-bind="autocompleteBind"
Expand Down

0 comments on commit f41794a

Please sign in to comment.