fix: race condition between mode switching #496

teritorio · Feb 27, 2025 · 826b3c0 · 826b3c0
1 parent d86964a
commit 826b3c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/components/Home/Home.vue b/components/Home/Home.vue
@@ -356,9 +356,11 @@ function onBottomMenuButtonClick() {
   isMenuItemOpen.value = !isMenuItemOpen.value
 }
 
-function onQuitExplorerFavoriteMode() {
+async function onQuitExplorerFavoriteMode() {
+  if (mapFeaturesRef.value)
+    await mapFeaturesRef.value.updateSelectedFeature()
+
   mode.value = Mode.BROWSER
-  mapStore.setSelectedFeature()
 }
 
 function toggleFavoriteMode() {
@@ -581,7 +583,7 @@ function handlePoiCardClose() {
           :small="isBottomMenuOpened"
           :categories="apiMenuCategory || []"
           :features="mapFeatures"
-          :selected-categories-ids="isModeExplorer ? [] : selectedCategoryIds"
+          :selected-categories-ids="selectedCategoryIds"
           :style-icon-filter="poiFilters"
           :enable-filter-route-by-categories="!isModeFavorites"
           :enable-filter-route-by-features="isModeFavorites"

diff --git a/components/MainMap/MapFeatures.vue b/components/MainMap/MapFeatures.vue
@@ -218,12 +218,12 @@ function onClick(e: MapMouseEvent): void {
 
 async function updateSelectedFeature(feature?: ApiPoi): Promise<void> {
   if (!feature) {
-    mapStore.setSelectedFeature()
-    menuStore.fetchFeatures({
+    await menuStore.fetchFeatures({
       vidoConfig: config!,
       categoryIds: props.selectedCategoriesIds,
       clipingPolygonSlug: route.query.clipingPolygonSlug?.toString(),
     })
+    mapStore.setSelectedFeature()
   }
   else {
     const id = feature.properties.metadata.id || feature.properties.id || feature.id