From 740b96c878b0b839f86a85fe18e049d52798f971 Mon Sep 17 00:00:00 2001
From: prototypa <prototypearea.dev@gmail.com>
Date: Mon, 14 Oct 2024 10:19:11 -0400
Subject: [PATCH] Improved animation efficiency

---
 src/components/common/BasicScripts.astro | 114 +++++++++--------------
 1 file changed, 44 insertions(+), 70 deletions(-)

diff --git a/src/components/common/BasicScripts.astro b/src/components/common/BasicScripts.astro
index f1ce6b6fbe..db531d3b3d 100644
--- a/src/components/common/BasicScripts.astro
+++ b/src/components/common/BasicScripts.astro
@@ -164,10 +164,9 @@ import { UI } from 'astrowind:config';
 <script is:inline>
   /* Inspired by: https://github.com/heidkaemper/tailwindcss-intersect */
   const Observer = {
-    observers: {},
-    visibleElementsQueue: [],
-    processing: false,
+    observer: null,
     delayBetweenAnimations: 100,
+    animationCounter: 0,
 
     start() {
       const selectors = [
@@ -182,8 +181,6 @@ import { UI } from 'astrowind:config';
 
       const elements = Array.from(document.querySelectorAll(selectors.join(',')));
 
-      elements.forEach((el) => el.setAttribute('no-intersect', ''));
-
       const getThreshold = (element) => {
         if (element.classList.contains('intersect-full')) return 0.99;
         if (element.classList.contains('intersect-half')) return 0.5;
@@ -191,86 +188,63 @@ import { UI } from 'astrowind:config';
         return 0;
       };
 
-      Object.values(this.observers).forEach((observer) => observer.disconnect());
-      this.observers = {};
+      elements.forEach((el) => {
+        el.setAttribute('no-intersect', '');
+        el._intersectionThreshold = getThreshold(el);
+      });
 
       const callback = (entries) => {
         entries.forEach((entry) => {
-          const target = entry.target;
-
-          if (entry.isIntersecting) {
-            if (target.classList.contains('intercept-no-queue')) {
-              target.removeAttribute('no-intersect');
-              if (target.classList.contains('intersect-once')) {
-                Object.values(this.observers).forEach((observer) => observer.unobserve(target));
+          requestAnimationFrame(() => {
+            const target = entry.target;
+            const intersectionRatio = entry.intersectionRatio;
+            const threshold = target._intersectionThreshold;
+
+            if (target.classList.contains('intersect-no-queue')) {
+              if (entry.isIntersecting) {
+                target.removeAttribute('no-intersect');
+                if (target.classList.contains('intersect-once')) {
+                  this.observer.unobserve(target);
+                }
+              } else {
+                target.setAttribute('no-intersect', '');
               }
               return;
             }
 
-            if (!this.visibleElementsQueue.includes(target)) {
-              this.visibleElementsQueue.push(target);
-            }
+            if (intersectionRatio >= threshold) {
+              if (!target.hasAttribute('data-animated')) {
+                target.removeAttribute('no-intersect');
+                target.setAttribute('data-animated', 'true');
+
+                const delay = this.animationCounter * this.delayBetweenAnimations;
+                this.animationCounter++;
+
+                target.style.transitionDelay = `${delay}ms`;
+                target.style.animationDelay = `${delay}ms`;
 
-            this.processQueue();
-          } else {
-            target.setAttribute('no-intersect', '');
+                if (target.classList.contains('intersect-once')) {
+                  this.observer.unobserve(target);
+                }
+              }
+            } else {
+              target.setAttribute('no-intersect', '');
+              target.removeAttribute('data-animated');
+              target.style.transitionDelay = '';
+              target.style.animationDelay = '';
 
-            const index = this.visibleElementsQueue.indexOf(target);
-            if (index > -1) {
-              this.visibleElementsQueue.splice(index, 1);
+              this.animationCounter = 0;
             }
-          }
+          });
         });
       };
 
-      elements.forEach((el) => {
-        const threshold = getThreshold(el);
-
-        if (!this.observers[threshold]) {
-          this.observers[threshold] = new IntersectionObserver(callback, { threshold });
-        }
+      this.observer = new IntersectionObserver(callback.bind(this), { threshold: [0, 0.25, 0.5, 0.99] });
 
-        this.observers[threshold].observe(el);
+      elements.forEach((el) => {
+        this.observer.observe(el);
       });
     },
-
-    async processQueue() {
-      if (this.processing) {
-        return;
-      }
-
-      this.processing = true;
-
-      while (this.visibleElementsQueue.length > 0) {
-        const element = this.visibleElementsQueue.shift();
-
-        element.removeAttribute('no-intersect');
-
-        if (element.classList.contains('intersect-once')) {
-          Object.values(this.observers).forEach((observer) => observer.unobserve(element));
-        }
-
-        if (this.isElementInViewport(element)) {
-          await this.delay(this.delayBetweenAnimations);
-        }
-      }
-
-      this.processing = false;
-    },
-
-    delay(ms) {
-      return new Promise((resolve) => setTimeout(resolve, ms));
-    },
-
-    isElementInViewport(element) {
-      const rect = element.getBoundingClientRect();
-      return (
-        rect.top < (window.innerHeight || document.documentElement.clientHeight) &&
-        rect.bottom > 0 &&
-        rect.left < (window.innerWidth || document.documentElement.clientWidth) &&
-        rect.right > 0
-      );
-    },
   };
 
   Observer.start();
@@ -278,4 +252,4 @@ import { UI } from 'astrowind:config';
   document.addEventListener('astro:after-swap', () => {
     Observer.start();
   });
-</script>
+</script>
\ No newline at end of file