From c6b4187e503141d9c84dc5f6e8f3eee51803ff53 Mon Sep 17 00:00:00 2001
From: Nikhil Tomar <nikhiltomar753@gmail.com>
Date: Tue, 27 Feb 2024 16:17:25 +0530
Subject: [PATCH] feat(controlledAccordions): supports toggles, disabled panels

---
 .../react/src/components/Accordion/Accordion.stories.js    | 7 ++++++-
 packages/react/src/components/Accordion/AccordionItem.tsx  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/components/Accordion/Accordion.stories.js b/packages/react/src/components/Accordion/Accordion.stories.js
index 30903aba281c..db43494e5820 100644
--- a/packages/react/src/components/Accordion/Accordion.stories.js
+++ b/packages/react/src/components/Accordion/Accordion.stories.js
@@ -73,7 +73,12 @@ export const Controlled = () => {
   const [expandAll, setExpandAll] = React.useState(false);
   return (
     <>
-      <Button onClick={() => setExpandAll(true)}>Click to expand all</Button>
+      <Button
+        onClick={() => {
+          expandAll === true ? setExpandAll(1) : setExpandAll(true);
+        }}>
+        Click to expand all
+      </Button>
       <Button
         onClick={() => {
           expandAll || expandAll === null
diff --git a/packages/react/src/components/Accordion/AccordionItem.tsx b/packages/react/src/components/Accordion/AccordionItem.tsx
index 15584ad9782e..d2b8af3bdb10 100644
--- a/packages/react/src/components/Accordion/AccordionItem.tsx
+++ b/packages/react/src/components/Accordion/AccordionItem.tsx
@@ -129,7 +129,7 @@ function AccordionItem({
   const prefix = usePrefix();
   const className = cx({
     [`${prefix}--accordion__item`]: true,
-    [`${prefix}--accordion__item--active`]: isOpen,
+    [`${prefix}--accordion__item--active`]: isOpen && !disabled,
     [`${prefix}--accordion__item--disabled`]: disabled,
     [customClassName]: !!customClassName,
   });