From e0a2b4654cf170a40be5128699ffcd36ac8ded76 Mon Sep 17 00:00:00 2001 From: Jacob Dubail Date: Mon, 10 Apr 2023 08:13:25 -0700 Subject: [PATCH 1/4] uses crypto.randomUUID in place of index for submenu ID --- packages/navigation/src/navigation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/navigation/src/navigation.js b/packages/navigation/src/navigation.js index 3c7e32f..bced0d0 100644 --- a/packages/navigation/src/navigation.js +++ b/packages/navigation/src/navigation.js @@ -200,9 +200,9 @@ export default class Navigation { * Adds JS classes and initial AIRA attributes. */ setupSubMenus() { - this.$submenus.forEach(($submenu, index) => { + this.$submenus.forEach(($submenu) => { const $anchor = $submenu.previousElementSibling; - const submenuID = `tenUp-submenu-${index}`; + const submenuID = `tenUp-submenu-${crypto.randomUUID()}`; $submenu.setAttribute('id', submenuID); From d2c2c20d3140e0e7a4c5e45b68f22592507ad322 Mon Sep 17 00:00:00 2001 From: Jacob Dubail Date: Tue, 11 Apr 2023 10:13:41 -0700 Subject: [PATCH 2/4] uses menu id as segment of submenu id --- packages/navigation/src/navigation.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/navigation/src/navigation.js b/packages/navigation/src/navigation.js index bced0d0..06f9446 100644 --- a/packages/navigation/src/navigation.js +++ b/packages/navigation/src/navigation.js @@ -200,9 +200,10 @@ export default class Navigation { * Adds JS classes and initial AIRA attributes. */ setupSubMenus() { - this.$submenus.forEach(($submenu) => { + const id = this.$menu.getAttribute('id'); + this.$submenus.forEach(($submenu, index) => { const $anchor = $submenu.previousElementSibling; - const submenuID = `tenUp-submenu-${crypto.randomUUID()}`; + const submenuID = `tenUp-submenu-${id}-${index}`; $submenu.setAttribute('id', submenuID); From e4d4fba6a510b3a93ee6d23681468bc49a6b88a8 Mon Sep 17 00:00:00 2001 From: Jacob Dubail Date: Tue, 11 Apr 2023 10:33:34 -0700 Subject: [PATCH 3/4] adds default fallback value for menu ID variable --- packages/navigation/src/navigation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/navigation/src/navigation.js b/packages/navigation/src/navigation.js index 06f9446..9a6057c 100644 --- a/packages/navigation/src/navigation.js +++ b/packages/navigation/src/navigation.js @@ -200,7 +200,7 @@ export default class Navigation { * Adds JS classes and initial AIRA attributes. */ setupSubMenus() { - const id = this.$menu.getAttribute('id'); + const id = this.$menu.getAttribute('id') ?? ''; this.$submenus.forEach(($submenu, index) => { const $anchor = $submenu.previousElementSibling; const submenuID = `tenUp-submenu-${id}-${index}`; From 793f58a7e743c513657a18d231574fd08370dca2 Mon Sep 17 00:00:00 2001 From: Joe Snell Date: Mon, 17 Apr 2023 15:38:10 -0700 Subject: [PATCH 4/4] Update navigation package version number --- packages/navigation/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/navigation/package.json b/packages/navigation/package.json index 7c2e32b..d6f0bd8 100644 --- a/packages/navigation/package.json +++ b/packages/navigation/package.json @@ -1,6 +1,6 @@ { "name": "@10up/component-navigation", - "version": "2.1.4", + "version": "2.1.5", "author": "10up", "description": "Accessible navigation component.", "main": "dist/index.js",