From b1a080cb91a85d97d7b9e06e6c28141960d08c17 Mon Sep 17 00:00:00 2001
From: Cory LaViska <cory@abeautifulsite.net>
Date: Fri, 12 Nov 2021 09:59:29 -0500
Subject: [PATCH] fix incorrect aria-controls

---
 docs/assets/plugins/code-block/code-block.js | 31 ++++++++++----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/docs/assets/plugins/code-block/code-block.js b/docs/assets/plugins/code-block/code-block.js
index e69df88aa..932a10c0a 100644
--- a/docs/assets/plugins/code-block/code-block.js
+++ b/docs/assets/plugins/code-block/code-block.js
@@ -114,7 +114,7 @@
       [...doc.querySelectorAll('code[class^="lang-"]')].map(code => {
         if (code.classList.contains('preview')) {
           const pre = code.closest('pre');
-          const preId = `code-block-preview-${count}`;
+          const sourceGroupId = `code-block-source-group-${count}`;
           const toggleId = `code-block-toggle-${count}`;
           const reactPre = getAdjacentExample('react', pre);
           const hasReact = reactPre !== null;
@@ -125,7 +125,6 @@
             }
           ];
 
-          pre.id = preId;
           pre.setAttribute('data-lang', pre.getAttribute('data-lang').replace(/ preview$/, ''));
           pre.setAttribute('aria-labelledby', toggleId);
 
@@ -138,24 +137,26 @@
                 </div>
               </div>
 
-              <div class="code-block__source code-block__source--html" ${hasReact ? 'data-flavor="html"' : ''}>
-                ${pre.outerHTML}
-              </div>
-
-              ${
-                hasReact
-                  ? `
-                <div class="code-block__source code-block__source--react" data-flavor="react">
-                  ${reactPre.outerHTML}
+              <div class="code-block__source-group" id="${sourceGroupId}">
+                <div class="code-block__source code-block__source--html" ${hasReact ? 'data-flavor="html"' : ''}>
+                  ${pre.outerHTML}
                 </div>
-              `
-                  : ''
-              }
+
+                ${
+                  hasReact
+                    ? `
+                  <div class="code-block__source code-block__source--react" data-flavor="react">
+                    ${reactPre.outerHTML}
+                  </div>
+                `
+                    : ''
+                }
+              </div>
 
               <div class="code-block__buttons">
                 ${hasReact ? ` ${htmlButton} ${reactButton} ` : ''}
 
-                <button type="button" class="code-block__button code-block__toggle" aria-expanded="false" aria-controls="${preId}">
+                <button type="button" class="code-block__button code-block__toggle" aria-expanded="false" aria-controls="${sourceGroupId}">
                   Source
                   <svg
                     viewBox="0 0 24 24"