From 6d252b420e04da1edead0101b49cf8ea07665c08 Mon Sep 17 00:00:00 2001
From: Pinaki Bhattacharjee <pinakipb2@gmail.com>
Date: Mon, 28 Aug 2023 19:32:42 +0530
Subject: [PATCH 1/3] Fix a11y in sidebar

Fixes #9162
---
 .../theme/DocSidebarItem/Category/index.tsx   | 26 +++++++++++++++----
 .../locales/ar/theme-common.json              |  3 ++-
 .../locales/base/theme-common.json            |  3 ++-
 .../locales/bn/theme-common.json              |  3 ++-
 .../locales/cs/theme-common.json              |  3 ++-
 .../locales/da/theme-common.json              |  3 ++-
 .../locales/de/theme-common.json              |  3 ++-
 .../locales/es/theme-common.json              |  3 ++-
 .../locales/fa/theme-common.json              |  3 ++-
 .../locales/fil/theme-common.json             |  3 ++-
 .../locales/fr/theme-common.json              |  3 ++-
 .../locales/he/theme-common.json              |  3 ++-
 .../locales/hi/theme-common.json              |  3 ++-
 .../locales/hu/theme-common.json              |  3 ++-
 .../locales/it/theme-common.json              |  3 ++-
 .../locales/ja/theme-common.json              |  3 ++-
 .../locales/ko/theme-common.json              |  3 ++-
 .../locales/nb/theme-common.json              |  3 ++-
 .../locales/nl/theme-common.json              |  3 ++-
 .../locales/pl/theme-common.json              |  3 ++-
 .../locales/pt-BR/theme-common.json           |  3 ++-
 .../locales/pt-PT/theme-common.json           |  3 ++-
 .../locales/ru/theme-common.json              |  3 ++-
 .../locales/sl/theme-common.json              |  3 ++-
 .../locales/sr/theme-common.json              |  3 ++-
 .../locales/sv/theme-common.json              |  3 ++-
 .../locales/tr/theme-common.json              |  3 ++-
 .../locales/uk/theme-common.json              |  3 ++-
 .../locales/vi/theme-common.json              |  3 ++-
 .../locales/zh-Hans/theme-common.json         |  3 ++-
 .../locales/zh-Hant/theme-common.json         |  3 ++-
 31 files changed, 81 insertions(+), 35 deletions(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
index a3bb2f05d355..bab2fa8def22 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
@@ -72,20 +72,35 @@ function useCategoryHrefWithSSRFallback(
 }
 
 function CollapseButton({
+  isActive,
   categoryLabel,
   onClick,
 }: {
+  isActive: boolean;
   categoryLabel: string;
   onClick: ComponentProps<'button'>['onClick'];
 }) {
-  return (
+  return isActive ? (
+    <button
+      aria-label={translate(
+        {
+          id: 'theme.DocSidebarItem.collapseCategoryAriaLabel',
+          message: "Collapse sidebar category '{label}'",
+          description: 'The ARIA label to collapse the sidebar category',
+        },
+        {label: categoryLabel},
+      )}
+      type="button"
+      className="clean-btn menu__caret"
+      onClick={onClick}
+    />
+  ) : (
     <button
       aria-label={translate(
         {
-          id: 'theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel',
-          message: "Toggle the collapsible sidebar category '{label}'",
-          description:
-            'The ARIA label to toggle the collapsible sidebar category',
+          id: 'theme.DocSidebarItem.expandCategoryAriaLabel',
+          message: "Expand sidebar category '{label}'",
+          description: 'The ARIA label to expand the sidebar category',
         },
         {label: categoryLabel},
       )}
@@ -188,6 +203,7 @@ export default function DocSidebarItemCategory({
         </Link>
         {href && collapsible && (
           <CollapseButton
+            isActive={!collapsed}
             categoryLabel={label}
             onClick={(e) => {
               e.preventDefault();
diff --git a/packages/docusaurus-theme-translations/locales/ar/theme-common.json b/packages/docusaurus-theme-translations/locales/ar/theme-common.json
index 2a8dd9f715c3..a31519a79a42 100644
--- a/packages/docusaurus-theme-translations/locales/ar/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/ar/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "نسخ",
   "theme.CodeBlock.copyButtonAriaLabel": "نسخ الرمز إلى الحافظة",
   "theme.CodeBlock.wordWrapToggle": "تبديل التفاف النص",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "تبديل فئة الشريط الجاني القابل للاغلاق '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "هذه الصفحة لا تستجيب.",
   "theme.ErrorPageContent.tryAgain": "المحاولة مجددا",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/base/theme-common.json b/packages/docusaurus-theme-translations/locales/base/theme-common.json
index 267a271828ec..cbdb98d59db6 100644
--- a/packages/docusaurus-theme-translations/locales/base/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/base/theme-common.json
@@ -11,7 +11,8 @@
   "theme.CodeBlock.copyButtonAriaLabel___DESCRIPTION": "The ARIA label for copy code blocks button",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
   "theme.CodeBlock.wordWrapToggle___DESCRIPTION": "The title attribute for toggle word wrapping button of code block lines",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel___DESCRIPTION": "The ARIA label to toggle the collapsible sidebar category",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.title___DESCRIPTION": "The title of the fallback page when the page crashed",
diff --git a/packages/docusaurus-theme-translations/locales/bn/theme-common.json b/packages/docusaurus-theme-translations/locales/bn/theme-common.json
index 860f3c8eb492..8dc7fa769818 100644
--- a/packages/docusaurus-theme-translations/locales/bn/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/bn/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "কপি",
   "theme.CodeBlock.copyButtonAriaLabel": "ক্লিপবোর্ডে কোড কপি করুন",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/cs/theme-common.json b/packages/docusaurus-theme-translations/locales/cs/theme-common.json
index 946ce4b10e43..9753998f7bcc 100644
--- a/packages/docusaurus-theme-translations/locales/cs/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/cs/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Zkopírovat",
   "theme.CodeBlock.copyButtonAriaLabel": "Zkopírovat kód do schránky",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/da/theme-common.json b/packages/docusaurus-theme-translations/locales/da/theme-common.json
index c2a80b3bd062..ea9abfac5331 100644
--- a/packages/docusaurus-theme-translations/locales/da/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/da/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopier",
   "theme.CodeBlock.copyButtonAriaLabel": "Kopier kode til udklipsholder",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/de/theme-common.json b/packages/docusaurus-theme-translations/locales/de/theme-common.json
index 433d6e7bb8f2..ebf4d7afb98a 100644
--- a/packages/docusaurus-theme-translations/locales/de/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/de/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopieren",
   "theme.CodeBlock.copyButtonAriaLabel": "In die Zwischenablage kopieren",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Umschalten der Seitenleiste mit einklappbarer Kategorie '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Die Seite ist abgestürzt.",
   "theme.ErrorPageContent.tryAgain": "Nochmal versuchen",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/es/theme-common.json b/packages/docusaurus-theme-translations/locales/es/theme-common.json
index cba7a7629b50..33ccc0f0f78a 100644
--- a/packages/docusaurus-theme-translations/locales/es/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/es/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Copiar",
   "theme.CodeBlock.copyButtonAriaLabel": "Copiar código al portapapeles",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/fa/theme-common.json b/packages/docusaurus-theme-translations/locales/fa/theme-common.json
index 1ca4253ecf0c..bf6b80e775df 100644
--- a/packages/docusaurus-theme-translations/locales/fa/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/fa/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "کپی",
   "theme.CodeBlock.copyButtonAriaLabel": "کپی به کلیپ‌بورد",
   "theme.CodeBlock.wordWrapToggle": "تغییر نحوه نمایش کلمه",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "دسته‌بندی برچسب '{label}' در نوار کناری را تغییر دهید ",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "بارگذاری صفحه با خطا روبرو شد.",
   "theme.ErrorPageContent.tryAgain": "تلاش مجدد",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/fil/theme-common.json b/packages/docusaurus-theme-translations/locales/fil/theme-common.json
index 0b2043165060..9d8ba250ef63 100644
--- a/packages/docusaurus-theme-translations/locales/fil/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/fil/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopyahin",
   "theme.CodeBlock.copyButtonAriaLabel": "Kopyahin ang code sa clipboard",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/fr/theme-common.json b/packages/docusaurus-theme-translations/locales/fr/theme-common.json
index 1f7f56b7be00..aa440a30f0c7 100644
--- a/packages/docusaurus-theme-translations/locales/fr/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/fr/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Copier",
   "theme.CodeBlock.copyButtonAriaLabel": "Copier le code",
   "theme.CodeBlock.wordWrapToggle": "Activer/désactiver le retour à la ligne",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Plier/Déplier la catégorie '{label}' de la barre latérale",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Cette page a planté.",
   "theme.ErrorPageContent.tryAgain": "Réessayer",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/he/theme-common.json b/packages/docusaurus-theme-translations/locales/he/theme-common.json
index e9e513bf2c54..57817242be79 100644
--- a/packages/docusaurus-theme-translations/locales/he/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/he/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "העתק",
   "theme.CodeBlock.copyButtonAriaLabel": "העתק קוד ללוח העריכה",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/hi/theme-common.json b/packages/docusaurus-theme-translations/locales/hi/theme-common.json
index f40386aa81cb..dfd89f31e372 100644
--- a/packages/docusaurus-theme-translations/locales/hi/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/hi/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "कॉपी",
   "theme.CodeBlock.copyButtonAriaLabel": "क्लिपबोर्ड पर कोड कॉपी करें",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/hu/theme-common.json b/packages/docusaurus-theme-translations/locales/hu/theme-common.json
index b66329b8a75e..0cbd699d1d5e 100644
--- a/packages/docusaurus-theme-translations/locales/hu/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/hu/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Másolás",
   "theme.CodeBlock.copyButtonAriaLabel": "Másolás a vágólapra",
   "theme.CodeBlock.wordWrapToggle": "Szótörés váltása",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Összecsukás/kibontás kategória '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Hiba történt a oldalon.",
   "theme.ErrorPageContent.tryAgain": "Próbáld újra",
   "theme.NavBar.navAriaLabel": "Fő",
diff --git a/packages/docusaurus-theme-translations/locales/it/theme-common.json b/packages/docusaurus-theme-translations/locales/it/theme-common.json
index 406ea8d07acc..a889a9872cff 100644
--- a/packages/docusaurus-theme-translations/locales/it/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/it/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Copia",
   "theme.CodeBlock.copyButtonAriaLabel": "Copia il codice negli appunti",
   "theme.CodeBlock.wordWrapToggle": "Attiva/disattiva a capo automatico",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Attiva/disattiva la categoria '{label}' della barra laterale collassabile",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Questa pagina è andata in crash.",
   "theme.ErrorPageContent.tryAgain": "Prova di nuovo",
   "theme.NavBar.navAriaLabel": "Principale",
diff --git a/packages/docusaurus-theme-translations/locales/ja/theme-common.json b/packages/docusaurus-theme-translations/locales/ja/theme-common.json
index a5a7e70d9151..ac10dc533e1a 100644
--- a/packages/docusaurus-theme-translations/locales/ja/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/ja/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "コピー",
   "theme.CodeBlock.copyButtonAriaLabel": "クリップボードにコードをコピー",
   "theme.CodeBlock.wordWrapToggle": "折り返し",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "サイドバーのカテゴリー「{label}」を開く・閉じる",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "エラーが発生しました",
   "theme.ErrorPageContent.tryAgain": "もう一度試してください",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/ko/theme-common.json b/packages/docusaurus-theme-translations/locales/ko/theme-common.json
index e2d99ccff2eb..b5237e0abde2 100644
--- a/packages/docusaurus-theme-translations/locales/ko/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/ko/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "복사",
   "theme.CodeBlock.copyButtonAriaLabel": "클립보드에 코드 복사",
   "theme.CodeBlock.wordWrapToggle": "줄 바꿈 전환",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "접을 수 있는 사이드바 분류 '{label}' 접기(펼치기)",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "페이지에 오류가 발생하였습니다.",
   "theme.ErrorPageContent.tryAgain": "다시 시도해 보세요",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/nb/theme-common.json b/packages/docusaurus-theme-translations/locales/nb/theme-common.json
index 51e54861f112..62ab5577c3ee 100644
--- a/packages/docusaurus-theme-translations/locales/nb/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/nb/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopiere",
   "theme.CodeBlock.copyButtonAriaLabel": "Kopier koden til utklippstavlen",
   "theme.CodeBlock.wordWrapToggle": "Slå tekstbryting av/på",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Veksle på den sammenleggbare sidefeltkategorien '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Denne siden krasjet.",
   "theme.ErrorPageContent.tryAgain": "Prøv på nytt",
   "theme.NavBar.navAriaLabel": "Hoved",
diff --git a/packages/docusaurus-theme-translations/locales/nl/theme-common.json b/packages/docusaurus-theme-translations/locales/nl/theme-common.json
index 44bd7d50fc40..76aaed23f20a 100644
--- a/packages/docusaurus-theme-translations/locales/nl/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/nl/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopieer",
   "theme.CodeBlock.copyButtonAriaLabel": "Kopieer code naar klembord",
   "theme.CodeBlock.wordWrapToggle": "Tekstterugloop in-/uitschakelen",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Klap de opvouwbare zijbalkcategorie '{label}' in of uit",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Deze pagina is gecrasht.",
   "theme.ErrorPageContent.tryAgain": "Probeer opnieuw",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/pl/theme-common.json b/packages/docusaurus-theme-translations/locales/pl/theme-common.json
index 5990b6bf20fc..48b1148d5824 100644
--- a/packages/docusaurus-theme-translations/locales/pl/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/pl/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopiuj",
   "theme.CodeBlock.copyButtonAriaLabel": "Kopiuj do schowka",
   "theme.CodeBlock.wordWrapToggle": "Przełącz zawijanie słów",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Przełącz zwijalną kategorię panelu bocznego '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Ta strona uległa awarii.",
   "theme.ErrorPageContent.tryAgain": "Spróbuj ponownie",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/pt-BR/theme-common.json b/packages/docusaurus-theme-translations/locales/pt-BR/theme-common.json
index dbc04c0f3556..c2b00bd30b59 100644
--- a/packages/docusaurus-theme-translations/locales/pt-BR/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/pt-BR/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Copiar",
   "theme.CodeBlock.copyButtonAriaLabel": "Copiar código para a área de transferência",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/pt-PT/theme-common.json b/packages/docusaurus-theme-translations/locales/pt-PT/theme-common.json
index 7623b6e448f3..65f2d5f89775 100644
--- a/packages/docusaurus-theme-translations/locales/pt-PT/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/pt-PT/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Copiar",
   "theme.CodeBlock.copyButtonAriaLabel": "Copiar código para a área de transferência",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/ru/theme-common.json b/packages/docusaurus-theme-translations/locales/ru/theme-common.json
index b6630f71d617..96aa3b98bbf7 100644
--- a/packages/docusaurus-theme-translations/locales/ru/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/ru/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Скопировать",
   "theme.CodeBlock.copyButtonAriaLabel": "Скопировать в буфер обмена",
   "theme.CodeBlock.wordWrapToggle": "Переключить перенос по строкам",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Свернуть/развернуть категорию '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "На странице произошёл сбой.",
   "theme.ErrorPageContent.tryAgain": "Попробуйте ещё раз",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/sl/theme-common.json b/packages/docusaurus-theme-translations/locales/sl/theme-common.json
index 22bfb6b15b4a..e2f50862463d 100644
--- a/packages/docusaurus-theme-translations/locales/sl/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/sl/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopiraj",
   "theme.CodeBlock.copyButtonAriaLabel": "Kopiraj v odložišče",
   "theme.CodeBlock.wordWrapToggle": "Preklopi oblivanje besedila",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Preklopi zložljivo kategorijo v stranski vrstici '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Ta stran se je zrušila.",
   "theme.ErrorPageContent.tryAgain": "Poskusite ponovno",
   "theme.NavBar.navAriaLabel": "Glavna navigacija",
diff --git a/packages/docusaurus-theme-translations/locales/sr/theme-common.json b/packages/docusaurus-theme-translations/locales/sr/theme-common.json
index 568b0c3bc26f..8cf01d94279c 100644
--- a/packages/docusaurus-theme-translations/locales/sr/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/sr/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Копирај",
   "theme.CodeBlock.copyButtonAriaLabel": "Копирај код у меморију",
   "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "This page crashed.",
   "theme.ErrorPageContent.tryAgain": "Try again",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/sv/theme-common.json b/packages/docusaurus-theme-translations/locales/sv/theme-common.json
index cf30e188d9fd..8a2fe4704420 100644
--- a/packages/docusaurus-theme-translations/locales/sv/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/sv/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopiera",
   "theme.CodeBlock.copyButtonAriaLabel": "Kopiera kod till urklipp",
   "theme.CodeBlock.wordWrapToggle": "Växla radbrytning",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Växla den hopfällbara sidomenyn för kategori '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Denna sida har kraschat.",
   "theme.ErrorPageContent.tryAgain": "Försök igen",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/tr/theme-common.json b/packages/docusaurus-theme-translations/locales/tr/theme-common.json
index 817a344af025..673869abee47 100644
--- a/packages/docusaurus-theme-translations/locales/tr/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/tr/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Kopyala",
   "theme.CodeBlock.copyButtonAriaLabel": "Kodu panoya kopyala",
   "theme.CodeBlock.wordWrapToggle": "Kelime kaydırmayı aç/kapat",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Bu sayfa çöktü.",
   "theme.ErrorPageContent.tryAgain": "Tekrar deneyin",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/uk/theme-common.json b/packages/docusaurus-theme-translations/locales/uk/theme-common.json
index e1247c8362ba..f62e5f6a5d6c 100644
--- a/packages/docusaurus-theme-translations/locales/uk/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/uk/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Копіювати",
   "theme.CodeBlock.copyButtonAriaLabel": "Копіювати в буфер обміну",
   "theme.CodeBlock.wordWrapToggle": "Перемикання обведення слів",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Згорнути/розгорнути категорію '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "На сторінці стався збій.",
   "theme.ErrorPageContent.tryAgain": "Спробуйте ще раз",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/vi/theme-common.json b/packages/docusaurus-theme-translations/locales/vi/theme-common.json
index 65dee1c9a396..01728da7ae3b 100644
--- a/packages/docusaurus-theme-translations/locales/vi/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/vi/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "Sao chép",
   "theme.CodeBlock.copyButtonAriaLabel": "Sao chép code vào bộ nhớ tạm",
   "theme.CodeBlock.wordWrapToggle": "Chuyển đổi văn bản xuống dòng",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Chuyển đổi danh mục thanh bên có thể thu gọn '{label}'",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "Trang này đã bị lỗi.",
   "theme.ErrorPageContent.tryAgain": "Thử lại",
   "theme.NavBar.navAriaLabel": "Main",
diff --git a/packages/docusaurus-theme-translations/locales/zh-Hans/theme-common.json b/packages/docusaurus-theme-translations/locales/zh-Hans/theme-common.json
index be0675f107b5..8faa0785e640 100644
--- a/packages/docusaurus-theme-translations/locales/zh-Hans/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/zh-Hans/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "复制",
   "theme.CodeBlock.copyButtonAriaLabel": "复制代码到剪贴板",
   "theme.CodeBlock.wordWrapToggle": "切换自动换行",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "打开/收起侧边栏菜单「{label}」",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "页面已崩溃。",
   "theme.ErrorPageContent.tryAgain": "重试",
   "theme.NavBar.navAriaLabel": "主导航",
diff --git a/packages/docusaurus-theme-translations/locales/zh-Hant/theme-common.json b/packages/docusaurus-theme-translations/locales/zh-Hant/theme-common.json
index 9ad92bb93e31..e3b2f381855d 100644
--- a/packages/docusaurus-theme-translations/locales/zh-Hant/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/zh-Hant/theme-common.json
@@ -5,7 +5,8 @@
   "theme.CodeBlock.copy": "複製",
   "theme.CodeBlock.copyButtonAriaLabel": "複製代碼至剪貼簿",
   "theme.CodeBlock.wordWrapToggle": "切換自動換行",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "打開/收起側邊欄選單「{label}」",
+  "theme.DocSidebarItem.collapseCategoryAriaLabel": "Collapse sidebar category '{label}'",
+  "theme.DocSidebarItem.expandCategoryAriaLabel": "Expand sidebar category '{label}'",
   "theme.ErrorPageContent.title": "此頁已當機。",
   "theme.ErrorPageContent.tryAgain": "重試",
   "theme.NavBar.navAriaLabel": "主導航",

From 39d615c59585100b6d0f946f7dce0fc8fa82899f Mon Sep 17 00:00:00 2001
From: Pinaki Bhattacharjee <pinakipb2@gmail.com>
Date: Thu, 31 Aug 2023 15:49:10 +0530
Subject: [PATCH 2/3] Added ternary on aria-label

---
 .../theme/DocSidebarItem/Category/index.tsx   | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
index bab2fa8def22..dc26d589b8c9 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
@@ -80,30 +80,27 @@ function CollapseButton({
   categoryLabel: string;
   onClick: ComponentProps<'button'>['onClick'];
 }) {
-  return isActive ? (
-    <button
-      aria-label={translate(
-        {
-          id: 'theme.DocSidebarItem.collapseCategoryAriaLabel',
-          message: "Collapse sidebar category '{label}'",
-          description: 'The ARIA label to collapse the sidebar category',
-        },
-        {label: categoryLabel},
-      )}
-      type="button"
-      className="clean-btn menu__caret"
-      onClick={onClick}
-    />
-  ) : (
+  return (
     <button
-      aria-label={translate(
-        {
-          id: 'theme.DocSidebarItem.expandCategoryAriaLabel',
-          message: "Expand sidebar category '{label}'",
-          description: 'The ARIA label to expand the sidebar category',
-        },
-        {label: categoryLabel},
-      )}
+      aria-label={
+        isActive
+          ? translate(
+              {
+                id: 'theme.DocSidebarItem.collapseCategoryAriaLabel',
+                message: "Collapse sidebar category '{label}'",
+                description: 'The ARIA label to collapse the sidebar category',
+              },
+              {label: categoryLabel},
+            )
+          : translate(
+              {
+                id: 'theme.DocSidebarItem.expandCategoryAriaLabel',
+                message: "Expand sidebar category '{label}'",
+                description: 'The ARIA label to expand the sidebar category',
+              },
+              {label: categoryLabel},
+            )
+      }
       type="button"
       className="clean-btn menu__caret"
       onClick={onClick}

From 7c02820e66c6a4b935024c459818d1690a624b5b Mon Sep 17 00:00:00 2001
From: sebastienlorber <lorber.sebastien@gmail.com>
Date: Thu, 14 Sep 2023 10:40:24 +0200
Subject: [PATCH 3/3] Rename isActive props

---
 .../theme/DocSidebarItem/Category/index.tsx   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
index dc26d589b8c9..8890a8043d2b 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
@@ -72,31 +72,31 @@ function useCategoryHrefWithSSRFallback(
 }
 
 function CollapseButton({
-  isActive,
+  collapsed,
   categoryLabel,
   onClick,
 }: {
-  isActive: boolean;
+  collapsed: boolean;
   categoryLabel: string;
   onClick: ComponentProps<'button'>['onClick'];
 }) {
   return (
     <button
       aria-label={
-        isActive
+        collapsed
           ? translate(
               {
-                id: 'theme.DocSidebarItem.collapseCategoryAriaLabel',
-                message: "Collapse sidebar category '{label}'",
-                description: 'The ARIA label to collapse the sidebar category',
+                id: 'theme.DocSidebarItem.expandCategoryAriaLabel',
+                message: "Expand sidebar category '{label}'",
+                description: 'The ARIA label to expand the sidebar category',
               },
               {label: categoryLabel},
             )
           : translate(
               {
-                id: 'theme.DocSidebarItem.expandCategoryAriaLabel',
-                message: "Expand sidebar category '{label}'",
-                description: 'The ARIA label to expand the sidebar category',
+                id: 'theme.DocSidebarItem.collapseCategoryAriaLabel',
+                message: "Collapse sidebar category '{label}'",
+                description: 'The ARIA label to collapse the sidebar category',
               },
               {label: categoryLabel},
             )
@@ -200,7 +200,7 @@ export default function DocSidebarItemCategory({
         </Link>
         {href && collapsible && (
           <CollapseButton
-            isActive={!collapsed}
+            collapsed={collapsed}
             categoryLabel={label}
             onClick={(e) => {
               e.preventDefault();