From 87749bf6b83c0aae7927e1ab82e625c7f636148f Mon Sep 17 00:00:00 2001
From: MinamiFunakoshiTR <minami.funakoshi@thomsonreuters.com>
Date: Mon, 1 Dec 2025 14:00:07 -0500
Subject: [PATCH] clean up event listener destroy redundancy

---
 .../ScrollerLottie/ScrollerLottie.svelte          | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/ScrollerLottie/ScrollerLottie.svelte b/src/components/ScrollerLottie/ScrollerLottie.svelte
index 90c03afa..bf242e5b 100644
--- a/src/components/ScrollerLottie/ScrollerLottie.svelte
+++ b/src/components/ScrollerLottie/ScrollerLottie.svelte
@@ -153,18 +153,15 @@
     }
 
     return () => {
-      lottiePlayer?.destroy();
+      if (lottiePlayer) {
+        lottiePlayer.removeEventListener('load', onLoadEvent);
+        lottiePlayer.removeEventListener('frame', onRenderEvent);
+        lottiePlayer.removeEventListener('complete', onCompleteEvent);
+        lottiePlayer.destroy();
+      }
     };
   });
 
-  onDestroy(() => {
-    if (lottiePlayer) {
-      lottiePlayer.removeEventListener('render', onRender);
-      lottiePlayer.removeEventListener('load', onLoad);
-      lottiePlayer.destroy();
-    }
-  });
-
   // Handles progress change
   $effect(() => {
     if (lottieState.isLoaded && lottieState.progress !== progress) {