From c5ac0af7893d244ba1fc5d3b4f7ef9fb88adf62f Mon Sep 17 00:00:00 2001 From: pramod-cog Date: Fri, 31 Jan 2025 15:25:39 +0100 Subject: [PATCH] fixed imageCollection return value from useAciveRevealResources hook (#4974) --- .../src/hooks/useActiveReveal3dResources.ts | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/react-components/src/hooks/useActiveReveal3dResources.ts b/react-components/src/hooks/useActiveReveal3dResources.ts index f58aee76021..69f8d1acd20 100644 --- a/react-components/src/hooks/useActiveReveal3dResources.ts +++ b/react-components/src/hooks/useActiveReveal3dResources.ts @@ -35,6 +35,13 @@ export const useActiveReveal3dResources = ( return models.filter((m) => m.visible); }, [models, layerState]); + const filteredImage360Collections = useMemo(() => { + if (layerState === undefined) { + return EMPTY_ARRAY; + } + return image360Collections.filter((c) => c.getIconsVisibility()); + }, [image360Collections, layerState]); + const filteredModelsQuery = useQuery({ queryKey: [ 'visible-3d-models', @@ -67,22 +74,8 @@ export const useActiveReveal3dResources = ( staleTime: Infinity }); - const filteredImage360CollectionsQuery = useQuery({ - queryKey: [ - 'visible-image360-collections', - image360Collections.map((image360Collection) => `${image360Collection.id}`).sort() - ], - queryFn: async () => { - return image360Collections.filter((image360Collection) => - image360Collection.getIconsVisibility() - ); - }, - enabled: image360Collections.length > 0, - staleTime: Infinity - }); - return { models: filteredModelsQuery.data ?? EMPTY_ARRAY, - image360Collections: filteredImage360CollectionsQuery.data ?? EMPTY_ARRAY + image360Collections: filteredImage360Collections }; };