Fix: Expand/Collapse toggling (#1750)

microsoftgraph · May 25, 2022 · 9a2f1a7 · 9a2f1a7
1 parent e14ba4f
commit 9a2f1a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/app/utils/generate-groups.ts b/src/app/utils/generate-groups.ts
@@ -1,6 +1,6 @@
 import { IGroup } from '@fluentui/react';
 
-export function generateGroupsFromList(list: any[], property: string) {
+export function generateGroupsFromList(list: any[], property: string) : IGroup[]{
   const map = new Map();
   const groups: IGroup[] = [];
 

diff --git a/src/app/views/sidebar/sample-queries/SampleQueries.tsx b/src/app/views/sidebar/sample-queries/SampleQueries.tsx
@@ -276,13 +276,9 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element =
   };
 
   const renderGroupHeader = (props: any): any => {
-    const onToggleSelectGroup = () => {
-      props.onToggleCollapse(props.group);
-    };
-
     return (
       <GroupHeader
-        compact={true}
+        {...props}
         styles={{
           check: { display: 'none' },
           title: {
@@ -293,8 +289,6 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element =
             fontSize: FontSizes.small
           }
         }}
-        {...props}
-        onToggleSelectGroup={onToggleSelectGroup}
       />
     );
   };
@@ -305,8 +299,9 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element =
 
   if (selectedQuery) {
     const index = groups.findIndex(k => k.key === selectedQuery.category);
-    if (index !== -1) {
+    if (index > 0 ) {
       groups[index].isCollapsed = false;
+      groups[0].isCollapsed = true;
     }
   }