Bug fix for #905.

davidjerleke · Jul 31, 2024 · c72b85d · c72b85d
1 parent f4fd87f
commit c72b85d
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/packages/embla-carousel/src/components/ResizeHandler.ts b/packages/embla-carousel/src/components/ResizeHandler.ts
@@ -25,6 +25,7 @@ export function ResizeHandler(
   watchResize: ResizeHandlerOptionType,
   nodeRects: NodeRectsType
 ): ResizeHandlerType {
+  const observeNodes = [container].concat(slides)
   let resizeObserver: ResizeObserver
   let containerSize: number
   let slideSizes: number[] = []
@@ -42,36 +43,37 @@ export function ResizeHandler(
 
     function defaultCallback(entries: ResizeObserverEntry[]): void {
       for (const entry of entries) {
+        if (destroyed) return
+
         const isContainer = entry.target === container
         const slideIndex = slides.indexOf(<HTMLElement>entry.target)
         const lastSize = isContainer ? containerSize : slideSizes[slideIndex]
         const newSize = readSize(isContainer ? container : slides[slideIndex])
         const diffSize = mathAbs(newSize - lastSize)
 
         if (diffSize >= 0.5) {
-          ownerWindow.requestAnimationFrame(() => {
-            emblaApi.reInit()
-            eventHandler.emit('resize')
-          })
+          emblaApi.reInit()
+          eventHandler.emit('resize')
+
           break
         }
       }
     }
 
     resizeObserver = new ResizeObserver((entries) => {
-      if (destroyed) return
       if (isBoolean(watchResize) || watchResize(emblaApi, entries)) {
         defaultCallback(entries)
       }
     })
 
-    const observeNodes = [container].concat(slides)
-    observeNodes.forEach((node) => resizeObserver.observe(node))
+    ownerWindow.requestAnimationFrame(() => {
+      observeNodes.forEach((node) => resizeObserver.observe(node))
+    })
   }
 
   function destroy(): void {
-    if (resizeObserver) resizeObserver.disconnect()
     destroyed = true
+    if (resizeObserver) resizeObserver.disconnect()
   }
 
   const self: ResizeHandlerType = {