@@ -15,6 +15,10 @@ import { MoreHorizontal20Regular } from "@fluentui/react-icons";
1515import React from "react" ;
1616import "../../styles/TaskList.css" ;
1717import { Task , TaskListProps } from "@/models" ;
18+ import CoralAccordion from "@/coral/components/CoralAccordion/CoralAccordion" ;
19+ import CoralAccordionItem from "@/coral/components/CoralAccordion/CoralAccordionItem" ;
20+ import CoralAccordionHeader from "@/coral/components/CoralAccordion/CoralAccordionHeader" ;
21+ import CoralAccordionPanel from "@/coral/components/CoralAccordion/CoralAccordionPanel" ;
1822
1923
2024
@@ -56,58 +60,45 @@ const TaskList: React.FC<TaskListProps> = ({
5660 </ div >
5761 ) ;
5862 } ;
63+
5964 const renderSkeleton = ( key : string ) => (
60- < div
61- key = { key }
62- className = "task-skeleton-container"
63- >
65+ < div key = { key } className = "task-skeleton-container" >
6466 < Skeleton aria-label = "Loading task" >
65- < div
66- className = "task-skeleton-content"
67- >
67+ < div className = "task-skeleton-wrapper" >
6868 < SkeletonItem
6969 shape = "rectangle"
7070 animation = "wave"
71- className = "task-skeleton-item"
71+ size = { 24 }
7272 />
7373 </ div >
7474 </ Skeleton >
7575 </ div >
7676 ) ;
7777
7878 return (
79- < Accordion defaultOpenItems = { [ "inprogress" ] } collapsible > < AccordionItem value = "inprogress" >
80- < AccordionHeader
81- expandIconPosition = "end"
82- className = "task-accordion-header-in-progress"
83- >
84- < Body1 > In progress</ Body1 >
85- </ AccordionHeader >
79+ < CoralAccordion >
80+ < CoralAccordionItem defaultOpen >
81+ < CoralAccordionHeader chevron > In progress</ CoralAccordionHeader >
8682
87- < AccordionPanel className = "task-accordion-panel" >
88- { loading && inProgressTasks . length === 0
89- ? [ ...Array ( 3 ) ] . map ( ( _ , i ) =>
90- renderSkeleton ( `inprogress-skel-${ i } ` )
91- )
92- : inProgressTasks . map ( renderTaskItem ) }
93- </ AccordionPanel >
94- </ AccordionItem > < AccordionItem value = "completed" >
95- < AccordionHeader
96- expandIconPosition = "end"
97- className = "task-accordion-header-completed"
98- >
99- < Body1 > Completed</ Body1 >
100- </ AccordionHeader >
83+ < CoralAccordionPanel >
84+ { loading && inProgressTasks . length === 0
85+ ? [ ...Array ( 3 ) ] . map ( ( _ , i ) =>
86+ renderSkeleton ( `inprogress-skel-${ i } ` )
87+ )
88+ : inProgressTasks . map ( renderTaskItem ) }
89+ </ CoralAccordionPanel >
90+ </ CoralAccordionItem >
10191
102- < AccordionPanel className = "task-accordion-panel" >
92+ < CoralAccordionItem >
93+ < CoralAccordionHeader chevron > Completed</ CoralAccordionHeader >
94+
95+ < CoralAccordionPanel >
10396 { loading && completedTasks . length === 0
104- ? [ ...Array ( 2 ) ] . map ( ( _ , i ) =>
105- renderSkeleton ( `completed-skel-${ i } ` )
106- )
97+ ? [ ...Array ( 2 ) ] . map ( ( _ , i ) => renderSkeleton ( `completed-skel-${ i } ` ) )
10798 : completedTasks . map ( renderTaskItem ) }
108- </ AccordionPanel >
109- </ AccordionItem >
110- </ Accordion >
99+ </ CoralAccordionPanel >
100+ </ CoralAccordionItem >
101+ </ CoralAccordion >
111102 ) ;
112103} ;
113104
0 commit comments