Merge branch 'develop' into update-concept-tree-node-styles

ingef · Sep 6, 2024 · cba386c · cba386c
2 parents 5d0faf9 + e871d72
commit cba386c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/frontend/src/js/concept-trees/ConceptTreeFolder.tsx b/frontend/src/js/concept-trees/ConceptTreeFolder.tsx
@@ -8,6 +8,7 @@ import ConceptTree from "./ConceptTree";
 import ConceptTreeNodeTextContainer from "./ConceptTreeNodeTextContainer";
 import { getConceptById } from "./globalTreeStoreHelper";
 import type { SearchT, TreesT } from "./reducer";
+import { isNodeInSearchResult } from "./selectors";
 
 const Root = styled("div")`
   font-size: ${({ theme }) => theme.font.sm};
@@ -57,6 +58,12 @@ const ConceptTreeFolder: FC<PropsT> = ({
     openInitially,
   });
 
+  if (!search.showMismatches) {
+    const shouldRender = isNodeInSearchResult(conceptId, search, tree.children);
+
+    if (!shouldRender) return null;
+  }
+
   const matchingEntries =
     !tree.children || !tree.matchingEntries
       ? null