From d25416d44afce7ff17ca5bb6855ac1c65248873e Mon Sep 17 00:00:00 2001
From: AlexandruPopovici <alexandrupopoviciioan@gmail.com>
Date: Mon, 1 Apr 2024 13:15:17 +0300
Subject: [PATCH] Fixed WEB-745

---
 .../modules/extensions/FilteringExtension.ts  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/viewer/src/modules/extensions/FilteringExtension.ts b/packages/viewer/src/modules/extensions/FilteringExtension.ts
index d9afb6a28..5c5e229ad 100644
--- a/packages/viewer/src/modules/extensions/FilteringExtension.ts
+++ b/packages/viewer/src/modules/extensions/FilteringExtension.ts
@@ -298,34 +298,47 @@ export class FilteringExtension extends Extension {
     const rampTexture = Assets.generateDiscreetRampTexture(
       valueGroupColors.map((v) => v.color.getHex())
     )
-    const nonMatchingRvs: NodeRenderView[] = []
+
     // TODO: note that this does not handle well nested element categories. For example,
     // windows (family instances) inside walls get the same color as the walls, even though
     // they are identified as a different category.
     // 07.05.2023: Attempt on fixing the issue described above. This fixes #1525, but it does
     // add a bit of overhead. Not 100% sure if it breaks anything else tho'
+    const nonMatchingMap = {}
     this.WTI.walk((node: TreeNode) => {
       if (!node.model.atomic || this.WTI.isRoot(node) || this.WTI.isSubtreeRoot(node)) {
         return true
       }
+
       const vg = valueGroupColors.find((v) => {
         return v['idMap'][node.model.raw.id]
       })
       const rvNodes = this.WTI.getRenderTree().getRenderViewNodesForNode(node, node)
+
       if (!vg) {
-        nonMatchingRvs.push(...rvNodes.map((rvNode) => rvNode.model.renderView))
+        rvNodes.forEach(
+          (rvNode) =>
+            (nonMatchingMap[rvNode.model.renderView.renderData.id] =
+              rvNode.model.renderView)
+        )
+
         return true
       }
       const rvs = []
 
       rvNodes.forEach((value: TreeNode) => {
-        if (this.WTI.getRenderTree().getAtomicParent(value) === node)
+        if (this.WTI.getRenderTree().getAtomicParent(value) === node) {
           rvs.push(value.model.renderView)
+          /** In some cases, the same rv gets put in both non-matching and matching lists because of its hierarchy */
+          delete nonMatchingMap[value.model.renderView.renderData.id]
+        }
       })
 
       vg.rvs.push(...rvs)
       return true
     })
+
+    const nonMatchingRvs: NodeRenderView[] = Object.values(nonMatchingMap)
     /** Deleting this since we're not going to use it further */
     for (const vg of valueGroupColors) {
       delete vg['idMap']