From fc079b2b71197ab038fb74de61a57084f21ebdc9 Mon Sep 17 00:00:00 2001
From: Kristaps Fabians Geikins <fabians@speckle.systems>
Date: Mon, 12 Aug 2024 12:05:35 +0300
Subject: [PATCH] fix(fe2): fixes for too early viewer state init (#2634)

---
 .../components/viewer/PreSetupWrapper.vue         |  6 +++---
 packages/frontend-2/components/viewer/Scope.vue   |  6 +++---
 packages/frontend-2/lib/viewer/composables/ui.ts  | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/frontend-2/components/viewer/PreSetupWrapper.vue b/packages/frontend-2/components/viewer/PreSetupWrapper.vue
index c267b7d5a..e505208b6 100644
--- a/packages/frontend-2/components/viewer/PreSetupWrapper.vue
+++ b/packages/frontend-2/components/viewer/PreSetupWrapper.vue
@@ -115,9 +115,6 @@ const emit = defineEmits<{
 
 const route = useRoute()
 const { showTour, showControls } = useViewerTour()
-const {
-  filters: { hasAnyFiltersApplied }
-} = useFilterUtilities()
 
 const modelId = computed(() => route.params.modelId as string)
 
@@ -126,6 +123,9 @@ const projectId = computed(() => route.params.id as string)
 const state = useSetupViewer({
   projectId
 })
+const {
+  filters: { hasAnyFiltersApplied }
+} = useFilterUtilities({ state })
 const { isEnabled: isEmbedEnabled, hideSelectionInfo, isTransparent } = useEmbed()
 
 emit('setup', state)
diff --git a/packages/frontend-2/components/viewer/Scope.vue b/packages/frontend-2/components/viewer/Scope.vue
index 50bdfb06b..1010bc230 100644
--- a/packages/frontend-2/components/viewer/Scope.vue
+++ b/packages/frontend-2/components/viewer/Scope.vue
@@ -1,7 +1,7 @@
+<!-- eslint-disable vue/no-multiple-template-root -->
+<!-- eslint-disable vue/no-root-v-if -->
 <template>
-  <div>
-    <slot v-if="!wrapper" />
-  </div>
+  <slot v-if="!wrapper" />
 </template>
 <script setup lang="ts">
 import {
diff --git a/packages/frontend-2/lib/viewer/composables/ui.ts b/packages/frontend-2/lib/viewer/composables/ui.ts
index 6298ebfe1..1ee6408dd 100644
--- a/packages/frontend-2/lib/viewer/composables/ui.ts
+++ b/packages/frontend-2/lib/viewer/composables/ui.ts
@@ -9,7 +9,8 @@ import { isNonNullable } from '~~/lib/common/helpers/utils'
 import {
   useInjectedViewer,
   useInjectedViewerInterfaceState,
-  useInjectedViewerState
+  useInjectedViewerState,
+  type InjectableViewerState
 } from '~~/lib/viewer/composables/setup'
 import { useDiffBuilderUtilities } from '~~/lib/viewer/composables/setup/diff'
 import { useTourStageState } from '~~/lib/viewer/composables/tour'
@@ -98,10 +99,14 @@ export function useCameraUtilities() {
   }
 }
 
-export function useFilterUtilities() {
-  // const { instance } = useInjectedViewer()
-  const { filters, explodeFactor } = useInjectedViewerInterfaceState()
-  const { viewer } = useInjectedViewerState()
+export function useFilterUtilities(
+  options?: Partial<{ state: InjectableViewerState }>
+) {
+  const state = options?.state || useInjectedViewerState()
+  const {
+    viewer,
+    ui: { filters, explodeFactor }
+  } = state
 
   const isolateObjects = (
     objectIds: string[],