From 8065f2be7602153709108a247af3dbb2b9326ffd Mon Sep 17 00:00:00 2001
From: Stuart Clark <stu@rtclark.net>
Date: Tue, 26 Mar 2024 12:10:13 +1100
Subject: [PATCH] chore(#9): update javascript behaviours

---
 src/components/MenuItem.vue | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/components/MenuItem.vue b/src/components/MenuItem.vue
index f369632..8386a35 100644
--- a/src/components/MenuItem.vue
+++ b/src/components/MenuItem.vue
@@ -83,6 +83,8 @@
 
 <script>
 import ThemeMixin from "../mixins/theme"
+import CivicThemeCollapsible from '@civictheme/uikit/components/00-base/collapsible/collapsible'
+import CivicThemeFlyout from '@civictheme/uikit/components/00-base/flyout/flyout'
 
 export default {
   mixins: [ThemeMixin],
@@ -114,13 +116,11 @@ export default {
         // Attach client side only javascript.
         if (!process.client) return
         if (this.isCollapsible) {
-          delete require.cache[require.resolve('@civictheme/uikit/components/00-base/collapsible/collapsible')]
-          require('@civictheme/uikit/components/00-base/collapsible/collapsible')
+          new CivicThemeCollapsible(this.$el)
         }
 
         if (this.isFlyout) {
-          delete require.cache[require.resolve('@civictheme/uikit/components/00-base/flyout/flyout')]
-          require('@civictheme/uikit/components/00-base/flyout/flyout')
+          new CivicThemeFlyout(this.$el)
         }
       }
       catch(e) {
@@ -128,25 +128,15 @@ export default {
         console.error(e)
       }
     },
-
-    detachJs() {
-      if (this.isCollapsible) delete require.cache[require.resolve('@civictheme/uikit/components/00-base/collapsible/collapsible')]
-      if (this.isFlyout) delete require.cache[require.resolve('@civictheme/uikit/components/00-base/flyout/flyout')]
-    }
   },
 
-  created() {
+  mounted() {
     this.attachJs()
   },
 
-  beforeDestroy() {
-    this.detachJs()
-  },
-
   watch: {
     item(to) {
       if (to.children.length) {
-        this.detachJs()
         this.attachJs()
       }
     }