fix(slim-select): add destroy method for slim-select objects that sho…

…uld fix issue on macOs
FlorentinTh · Aug 9, 2023 · a152be2 · a152be2
1 parent 8e39210
commit a152be2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/src/scripts/add-data.js b/src/scripts/add-data.js
@@ -445,6 +445,20 @@ const addNewAnalysis = async () => {
   await writeData(dataValidated);
 };
 
+const destroySlimSelect = () => {
+  if (!(selectAntagonist === null)) {
+    selectAntagonist.destroy();
+  }
+
+  if (!(selectAgonist === null)) {
+    selectAgonist.destroy();
+  }
+
+  if (!(selectAngle === null)) {
+    selectAngle.destroy();
+  }
+};
+
 const writeData = async data => {
   const messageLabel = setupType === 'muscles' ? setupType.slice(0, -1) : setupType;
   loader.toggle({ message: `Saving new ${messageLabel}...` });
@@ -478,10 +492,12 @@ const writeData = async data => {
     errorOverlay.show();
   }
 
+  destroySlimSelect();
   router.switchPage('data-configuration');
 };
 
 resetButton.addEventListener('click', event => {
+  destroySlimSelect();
   router.switchPage('data-configuration');
 });
 

diff --git a/src/scripts/data-discovering.js b/src/scripts/data-discovering.js
@@ -629,6 +629,7 @@ submitButton.addEventListener('click', async () => {
 
                   errorOverlay.show();
                 } else {
+                  selectAnalysis.destroy();
                   router.switchPage('participants-selection');
                 }
               } catch (error) {
@@ -658,6 +659,7 @@ submitButton.addEventListener('click', async () => {
               errorOverlay.show();
             }
           } else {
+            selectAnalysis.destroy();
             router.switchPage('data-discovering');
           }
         } else {

diff --git a/src/scripts/edit-data.js b/src/scripts/edit-data.js
@@ -513,6 +513,22 @@ const getAnalysisData = () => {
   return new AnalysisModel(formData);
 };
 
+const destroySlimSelect = () => {
+  console.log('contentContainer' in elements);
+
+  if ('selectAntagonist' in elements) {
+    elements.selectAntagonist.destroy();
+  }
+
+  if ('selectAgonist' in elements) {
+    elements.selectAgonist.destroy();
+  }
+
+  if ('selectAngle' in elements) {
+    elements.selectAngle.destroy();
+  }
+};
+
 const updateData = async () => {
   let model;
 
@@ -570,10 +586,12 @@ const updateData = async () => {
     errorOverlay.show();
   }
 
+  destroySlimSelect();
   router.switchPage('data-configuration');
 };
 
 resetButton.addEventListener('click', event => {
+  destroySlimSelect();
   router.switchPage('data-configuration');
 });