From 384663912de82f7b57f3c8f309fa1217e2336934 Mon Sep 17 00:00:00 2001
From: sethburkart123 <seth.burkart@hills.adventist.edu.au>
Date: Thu, 19 Sep 2024 16:40:33 +1000
Subject: [PATCH] perf(ExtensionPopup): make extension popup animation buttery
 smooth

---
 src/SEQTA.ts                                 | 75 ++++++--------------
 src/seqta/utils/listeners/MessageListener.ts |  8 +--
 src/svelte-interface/pages/settings.svelte   |  7 +-
 3 files changed, 27 insertions(+), 63 deletions(-)

diff --git a/src/SEQTA.ts b/src/SEQTA.ts
index ce5f3f0a..0f3ba37f 100644
--- a/src/SEQTA.ts
+++ b/src/SEQTA.ts
@@ -1040,28 +1040,22 @@ export function AppendElementsToDisabledPage() {
   document.head.append(settingsStyle)
 }
 
-export function closeSettings() {
-  const ExtensionSettings = document.getElementById('ExtensionPopup')!
-  // = document.getElementById('ExtensionIframe') as HTMLIFrameElement
+export const closeExtensionPopup = (extensionPopup?: HTMLElement) => {
+  if (!extensionPopup) extensionPopup = document.getElementById('ExtensionPopup')!
 
-  if (SettingsClicked == true) {
-    ExtensionSettings!.classList.add('hide')
-    if (settingsState.animations) {
-      animate(
-        '#ExtensionPopup',
-        { opacity: [1, 0], scale: [1, 0] },
-        { easing: spring({ stiffness: 220, damping: 18 }) }
-      )
-    } else {
-      ExtensionSettings.style.opacity = '0'
-      ExtensionSettings.style.transform = 'scale(0)'
-    }
-    SettingsClicked = false
-
-    // hide extension frame
+  extensionPopup.classList.add('hide')
+  if (settingsState.animations) {
+    animate((progress) => {
+      extensionPopup.style.opacity = Math.max(0, 1 - progress).toString()
+      extensionPopup.style.transform = `scale(${Math.max(0, 1 - progress)})`
+    }, { easing: spring({ stiffness: 520, damping: 20 }) })
+  } else {
+    extensionPopup.style.opacity = '0'
+    extensionPopup.style.transform = 'scale(0)'
   }
-
-  ExtensionSettings!.classList.add('hide')
+  
+  settingsPopup.triggerClose()
+  SettingsClicked = false
 }
 
 export function addExtensionSettings() {
@@ -1083,26 +1077,11 @@ export function addExtensionSettings() {
   const container = document.getElementById('container')
 
   new SettingsResizer();
-  
-  const closeExtensionPopup = () => {
-    extensionPopup.classList.add('hide')
-    if (settingsState.animations) {
-      animate(
-        '#ExtensionPopup',
-        { opacity: [1, 0], scale: [1, 0] },
-        { easing: spring({ stiffness: 220, damping: 18 }) }
-      )
-    } else {
-      extensionPopup.style.opacity = '0'
-      extensionPopup.style.transform = 'scale(0)'
-    }
-    
-    settingsPopup.triggerClose()
-    SettingsClicked = false
-  }
 
   container!.onclick = (event) => {
-    if ((event.target as HTMLElement).closest('#AddedSettings') == null && SettingsClicked) {
+    if (!SettingsClicked) return;
+
+    if (!(event.target as HTMLElement).closest('#AddedSettings')) {
       if (event.target == extensionPopup) return;
       closeExtensionPopup()
     }
@@ -1338,31 +1317,17 @@ export function setupSettingsButton() {
   var AddedSettings = document.getElementById('AddedSettings');
   var extensionPopup = document.getElementById('ExtensionPopup');
 
-  AddedSettings!.addEventListener('click', async function () {
+  AddedSettings!.addEventListener('click', async () => {
     if (SettingsClicked) {
-      extensionPopup!.classList.add('hide');
-      if (settingsState.animations) {
-        animate('#ExtensionPopup', { opacity: [1, 0], scale: [1, 0] }, { easing: spring({ stiffness: 220, damping: 18 }) });
-      } else {
-        extensionPopup!.style.opacity = '0'
-        extensionPopup!.style.transform = 'scale(0)'
-      }
-      settingsPopup.triggerClose()
-      SettingsClicked = false;
+      closeExtensionPopup(extensionPopup as HTMLElement);
     } else {
       if (settingsState.animations) {
-        //animate('#ExtensionPopup', { opacity: [0, 1], scale: [0, 1] }, { easing: spring({ stiffness: 260, damping: 24 }) });
         animate((progress) => {
-          console.log(progress)
           extensionPopup!.style.opacity = progress.toString()
           extensionPopup!.style.transform = `scale(${progress})`
-        }, { easing: spring({ stiffness: 260, damping: 24 }) });
-
-        await delay(10)
+        }, { easing: spring({ stiffness: 280, damping: 20 }) });
 
         extensionPopup!.classList.remove('hide');
-        //extensionPopup!.style.opacity = '1'
-        //extensionPopup!.style.transform = 'scale(1)'
       } else {
         extensionPopup!.style.opacity = '1'
         extensionPopup!.style.transform = 'scale(1)'
diff --git a/src/seqta/utils/listeners/MessageListener.ts b/src/seqta/utils/listeners/MessageListener.ts
index 5a820eff..08d1b012 100644
--- a/src/seqta/utils/listeners/MessageListener.ts
+++ b/src/seqta/utils/listeners/MessageListener.ts
@@ -1,6 +1,6 @@
 import browser from 'webextension-polyfill'
 
-import { closeSettings, MenuOptionsOpen, OpenMenuOptions } from '../../../SEQTA';
+import { closeExtensionPopup, MenuOptionsOpen, OpenMenuOptions } from '../../../SEQTA';
 import { deleteTheme } from '@/seqta/ui/themes/deleteTheme';
 import { getAvailableThemes } from '@/seqta/ui/themes/getAvailableThemes';
 import { saveTheme } from '@/seqta/ui/themes/saveTheme';
@@ -23,7 +23,7 @@ export class MessageHandler {
     switch (request.info) {
       case 'EditSidebar':
         this.editSidebar();
-        closeSettings();
+        closeExtensionPopup();
         sendResponse({ status: 'success' });
         break;
   
@@ -77,7 +77,7 @@ export class MessageHandler {
       case 'OpenThemeCreator':
         const themeID = request?.body?.themeID;
         OpenThemeCreator( themeID ? themeID : '' );
-        closeSettings();
+        closeExtensionPopup();
         sendResponse({ status: 'success' });
         break;
       
@@ -110,7 +110,7 @@ export class MessageHandler {
   editSidebar() {
     if (!MenuOptionsOpen) {
       OpenMenuOptions();
-      closeSettings();
+      closeExtensionPopup();
     }
   }
 }
\ No newline at end of file
diff --git a/src/svelte-interface/pages/settings.svelte b/src/svelte-interface/pages/settings.svelte
index 061a6d49..35f9869e 100644
--- a/src/svelte-interface/pages/settings.svelte
+++ b/src/svelte-interface/pages/settings.svelte
@@ -9,7 +9,7 @@
   import { onMount } from 'svelte'
   import { settingsState } from '@/seqta/utils/listeners/SettingsState'
 
-  import { closeSettings, OpenAboutPage, OpenWhatsNewPopup } from "@/SEQTA"
+  import { closeExtensionPopup, OpenAboutPage, OpenWhatsNewPopup } from "@/SEQTA"
   import ColourPicker from '../components/ColourPicker.svelte'
   import { settingsPopup } from '../hooks/SettingsPopup'
 
@@ -20,12 +20,12 @@
 
   const openChangelog = () => {
     OpenWhatsNewPopup();
-    closeSettings();
+    closeExtensionPopup();
   };
 
   const openAbout = () => {
     OpenAboutPage();
-    closeSettings();
+    closeExtensionPopup();
   };
     
   let { standalone = false } = $props<{ standalone?: boolean }>();
@@ -51,7 +51,6 @@
       <img src={browser.runtime.getURL('resources/icons/betterseqta-light-full.png')} class="hidden w-4/5 dark:block" alt="Dark logo" />
       <button onclick={openChangelog} class="absolute right-0 w-8 h-8 text-lg rounded-xl font-IconFamily top-1 bg-zinc-100 dark:bg-zinc-700"></button>
       <button onclick={openAbout} class="absolute w-8 h-8 text-lg rounded-xl font-IconFamily top-1 right-10 bg-zinc-100 dark:bg-zinc-700">ⓘ</button>
-      <!-- <button onclick={() => showColourPicker = true} class="absolute w-8 h-8 text-lg rounded-xl font-IconFamily top-1 right-10 bg-zinc-100 dark:bg-zinc-700">ⓘ</button> -->
     </div>
 
     <TabbedContainer tabs={[