js/shoelace
1
0
Fork 0
mirror of https://github.com/shoelace-style/shoelace.git synced 2026-01-12 02:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Cory LaViska
2024-12-04 13:00:57 -05:00
parent 97fcab8f2a 077bff7832
commit 5d0c877a05
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/carousel/carousel.component.ts
View File

@@ -510,13 +510,19 @@ export default class SlCarousel extends ShoelaceElement {
// It's best to assume that we will and cleanup in the else case below if we didn't need to // It's best to assume that we will and cleanup in the else case below if we didn't need to
this.pendingSlideChange = true; this.pendingSlideChange = true;
window.requestAnimationFrame(() => { window.requestAnimationFrame(() => {
// This can happen if goToSlide is called before the scroll container is rendered
// We will have correctly set the activeSlide in goToSlide which will get picked up when initializeSlides is called.
if (!this.scrollContainer) {
return;
}
const scrollContainer = this.scrollContainer; const scrollContainer = this.scrollContainer;
const scrollContainerRect = scrollContainer.getBoundingClientRect(); const scrollContainerRect = scrollContainer.getBoundingClientRect();
const nextSlideRect = slide.getBoundingClientRect(); const nextSlideRect = slide.getBoundingClientRect();
const nextLeft = nextSlideRect.left - scrollContainerRect.left; const nextLeft = nextSlideRect.left - scrollContainerRect.left;
const nextTop = nextSlideRect.top - scrollContainerRect.top; const nextTop = nextSlideRect.top - scrollContainerRect.top;
if (nextLeft || nextTop) { if (nextLeft || nextTop) {
// This is here just in case someone set it back to false // This is here just in case someone set it back to false
// between rAF being requested and the callback actually running // between rAF being requested and the callback actually running