fix(fe2): fixes for too early viewer state init (#2634)
This commit is contained in:
committed by
GitHub
parent
4dae1569cd
commit
fc079b2b71
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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[],
|
||||
|
||||
Reference in New Issue
Block a user