From d574ba7090b2e3444c1a631d6e14279854961439 Mon Sep 17 00:00:00 2001
From: dizzy <diosmosis@users.noreply.github.com>
Date: Sun, 15 May 2022 14:24:42 -0700
Subject: correctly destroy vue entry components in widgetloader (#19216)

---
 plugins/CoreHome/vue/src/WidgetLoader/WidgetLoader.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'plugins/CoreHome/vue/src')

diff --git a/plugins/CoreHome/vue/src/WidgetLoader/WidgetLoader.vue b/plugins/CoreHome/vue/src/WidgetLoader/WidgetLoader.vue
index 2d1eeea6a7..7b42c8ab1c 100644
--- a/plugins/CoreHome/vue/src/WidgetLoader/WidgetLoader.vue
+++ b/plugins/CoreHome/vue/src/WidgetLoader/WidgetLoader.vue
@@ -105,7 +105,7 @@ export default defineComponent({
       this.loadWidgetUrl(this.widgetParams as QueryParameters, this.changeCounter += 1);
     }
   },
-  unmounted() {
+  beforeUnmount() {
     this.cleanupLastWidgetContent();
   },
   methods: {
@@ -117,12 +117,13 @@ export default defineComponent({
     },
     cleanupLastWidgetContent() {
       const widgetContent = this.$refs.widgetContent as HTMLElement;
-      if (widgetContent) {
-        widgetContent.innerHTML = '';
-      }
+      Matomo.helper.destroyVueComponent(widgetContent);
       if (this.currentScope) {
         this.currentScope.$destroy();
       }
+      if (widgetContent) {
+        widgetContent.innerHTML = '';
+      }
     },
     getWidgetUrl(parameters?: QueryParameters): QueryParameters {
       const urlParams = MatomoUrl.parsed.value;
-- 
cgit v1.2.3