From bec53f04869ac04a8d273dee5aa1150171819b0d Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 28 Oct 2022 22:16:49 +0200
Subject: [PATCH] fix #150: Active app is not visible has active in menu
 (except in default menu).

---
 src/SideMenuBig.vue            | 10 ++++++++--
 src/SideMenuWithCategories.vue | 12 ++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/SideMenuBig.vue b/src/SideMenuBig.vue
index 4cd7aa3..a51ba61 100644
--- a/src/SideMenuBig.vue
+++ b/src/SideMenuBig.vue
@@ -60,6 +60,7 @@ import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
 import SideMenuBigApp from './SideMenuBigApp'
+import { loadState } from '@nextcloud/initial-state'
 
 export default {
   name: 'SideMenuBig',
@@ -100,8 +101,13 @@ export default {
     },
 
     retrieveActiveApp() {
-      let activeAppLink = document.querySelector('#appmenu a.active')
-      this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+      const ncApps = loadState('core', 'apps', {})
+
+      for (let id in ncApps) {
+        if (ncApps[id].active) {
+          this.activeApp = id
+        }
+      }
     },
 
     retrieveConfig() {
diff --git a/src/SideMenuWithCategories.vue b/src/SideMenuWithCategories.vue
index 69c3d1b..556f45b 100644
--- a/src/SideMenuWithCategories.vue
+++ b/src/SideMenuWithCategories.vue
@@ -54,17 +54,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
-import CloserButton from './CloserButton'
 import SettingsButton from './SettingsButton'
 import Loader from './Loader'
 import SideMenuBigApp from './SideMenuBigApp'
+import { loadState } from '@nextcloud/initial-state'
 
 export default {
   name: 'SideMenuWithCategories',
   components: {
     SettingsButton,
     OpenerButton,
-    CloserButton,
     Loader,
     SideMenuBigApp,
   },
@@ -98,8 +97,13 @@ export default {
     },
 
     retrieveActiveApp() {
-      let activeAppLink = document.querySelector('#appmenu a.active')
-      this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+      const ncApps = loadState('core', 'apps', {})
+
+      for (let id in ncApps) {
+        if (ncApps[id].active) {
+          this.activeApp = id
+        }
+      }
     },
 
     retrieveConfig() {