Merge pull request #1168 from City-of-Helsinki/UHF-11278

UHF-11278: Survey - converted aria-hidden attributes to inert attributes
City-of-Helsinki · Jan 27, 2025 · 90385a5 · 90385a5
2 parents 1ac79a9 + 4a3fdbd
commit 90385a5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/dist/js/closable-surveys.min.js b/dist/js/closable-surveys.min.js
diff --git a/src/js/closable-surveys.js b/src/js/closable-surveys.js
@@ -74,20 +74,28 @@ import LocalStorageManager from './localStorageManager';
       function toggleOtherContentVisibility() {
         const mainContent = document.querySelector('.dialog-off-canvas-main-canvas');
         const cookieBanner = document.querySelector('.hds-cc__target');
+        const skipToMain = document.querySelector('.skip-link--skip-to-main');
         const surveyContainer = document.getElementById('helfi-survey__container');
 
-        if (mainContent && !mainContent.hasAttribute('aria-hidden') && surveyContainer) {
-          mainContent.setAttribute('aria-hidden', 'true');
+        if (mainContent && !mainContent.hasAttribute('inert') && surveyContainer) {
+          mainContent.setAttribute('inert', '');
         } else {
           // eslint-disable-next-line no-unused-expressions
-          mainContent && mainContent.removeAttribute('aria-hidden');
+          mainContent && mainContent.removeAttribute('inert');
         }
 
-        if (cookieBanner && !cookieBanner.hasAttribute('aria-hidden') && surveyContainer) {
-          cookieBanner.setAttribute('aria-hidden', 'true');
+        if (skipToMain && !skipToMain.hasAttribute('inert') && surveyContainer) {
+          skipToMain.setAttribute('inert', '');
         } else {
           // eslint-disable-next-line no-unused-expressions
-          cookieBanner && cookieBanner.removeAttribute('aria-hidden');
+          skipToMain && skipToMain.removeAttribute('inert');
+        }
+
+        if (cookieBanner && !cookieBanner.hasAttribute('inert') && surveyContainer) {
+          cookieBanner.setAttribute('inert', '');
+        } else {
+          // eslint-disable-next-line no-unused-expressions
+          cookieBanner && cookieBanner.removeAttribute('inert');
         }
       }
 
@@ -117,8 +125,8 @@ import LocalStorageManager from './localStorageManager';
         survey.remove();
         toggleNoScroll(false);
         setBodyPaddingRight(false);
-        focusToCookieBanner();
         toggleOtherContentVisibility();
+        focusToCookieBanner();
       }
 
       if (surveyCloseButton) {