From 18af12e134d74908abd84f91f603403ead2e11f0 Mon Sep 17 00:00:00 2001 From: Kasper Birch Date: Wed, 15 May 2024 13:32:56 +0200 Subject: [PATCH 1/8] Enhance `nav-grid` functionality to focus on next item after "show more" click --- src/stories/Library/nav-grid/init-nav-grid.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/stories/Library/nav-grid/init-nav-grid.js b/src/stories/Library/nav-grid/init-nav-grid.js index 769551b5d..b4365fefe 100644 --- a/src/stories/Library/nav-grid/init-nav-grid.js +++ b/src/stories/Library/nav-grid/init-nav-grid.js @@ -13,6 +13,15 @@ window.addEventListener("load", () => { button.addEventListener("click", () => { grid.classList.remove("nav-grid--folded"); + + // The 7th item is the first one that is initially hidden. + // For more details, refer to the ".nav-grid--folded" class in design-system src/stories/Library/nav-grid/nav-grid.scss + const seventhNavGridItem = grid.querySelector( + ".nav-grid__item:nth-child(7)" + ); + if (seventhNavGridItem) { + seventhNavGridItem.querySelector("a").focus(); + } }); }); }); From d33e58a05bede8c4d8e601cedbb91a40d39a45f2 Mon Sep 17 00:00:00 2001 From: Kasper Birch Date: Wed, 22 May 2024 08:44:04 +0200 Subject: [PATCH 2/8] Restructure heading tree structure This is important for accessibility and screen readers. Following the changes introduced in https://github.com/danskernesdigitalebibliotek/dpl-cms/pull/1154/ --- src/stories/Library/footer-accordions/FooterAccordion.tsx | 4 ++-- src/stories/Library/footer-colums/FooterColumn.tsx | 2 +- src/stories/Library/nav-spot/NavSpot.tsx | 2 +- src/stories/Library/nav-teaser/NavTeaser.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/stories/Library/footer-accordions/FooterAccordion.tsx b/src/stories/Library/footer-accordions/FooterAccordion.tsx index 3e74eba21..d76a5c5b0 100644 --- a/src/stories/Library/footer-accordions/FooterAccordion.tsx +++ b/src/stories/Library/footer-accordions/FooterAccordion.tsx @@ -16,7 +16,7 @@ const FooterAccordion: FC = ({ return ( <> -

+

-

+
= ({ title, content }) => { return ( <> -

{title}

+

{title}

= ({
-

{title}

+

{title}

{subtitle ?

{subtitle}

: ""} diff --git a/src/stories/Library/nav-teaser/NavTeaser.tsx b/src/stories/Library/nav-teaser/NavTeaser.tsx index a2c9defeb..1824d9e62 100644 --- a/src/stories/Library/nav-teaser/NavTeaser.tsx +++ b/src/stories/Library/nav-teaser/NavTeaser.tsx @@ -10,7 +10,7 @@ const NavTeaser: FC = ({ title, subtitle }) => { return (
-

{title}

+

{title}

{subtitle ?

{subtitle}

: ""} From bf3ae095cd35b86c6c6ac44f4fb57582ed4e068d Mon Sep 17 00:00:00 2001 From: Kasper Birch Date: Wed, 22 May 2024 09:45:07 +0200 Subject: [PATCH 3/8] Refactor `focus` logic for `nav-grid` This is to avoid magic numbers in the selector and will work if the CSS that determines the number of hidden items should be changed. --- src/stories/Library/nav-grid/init-nav-grid.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/stories/Library/nav-grid/init-nav-grid.js b/src/stories/Library/nav-grid/init-nav-grid.js index b4365fefe..c61e9925c 100644 --- a/src/stories/Library/nav-grid/init-nav-grid.js +++ b/src/stories/Library/nav-grid/init-nav-grid.js @@ -11,16 +11,15 @@ window.addEventListener("load", () => { return; } + const firstHiddenLink = Array.from(grid.querySelectorAll(".nav-grid__item")) + .find((item) => window.getComputedStyle(item).display === "none") + ?.querySelector("a"); + button.addEventListener("click", () => { grid.classList.remove("nav-grid--folded"); - // The 7th item is the first one that is initially hidden. - // For more details, refer to the ".nav-grid--folded" class in design-system src/stories/Library/nav-grid/nav-grid.scss - const seventhNavGridItem = grid.querySelector( - ".nav-grid__item:nth-child(7)" - ); - if (seventhNavGridItem) { - seventhNavGridItem.querySelector("a").focus(); + if (firstHiddenLink) { + firstHiddenLink.focus(); } }); }); From 3608c621149f3a5f3a5e84c840fecb35178f7f2b Mon Sep 17 00:00:00 2001 From: Kasper Birch Date: Wed, 22 May 2024 11:33:33 +0200 Subject: [PATCH 4/8] Trigger chromatic From b477604092058611fd960116a641094a1e6bdb75 Mon Sep 17 00:00:00 2001 From: Kasper Birch Date: Wed, 22 May 2024 11:35:18 +0200 Subject: [PATCH 5/8] Trigger chromatic From 56ed927903f9a7a044c5ebf1e9546b9432e48082 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 01:28:50 +0000 Subject: [PATCH 6/8] Bump web-vitals from 3.5.2 to 4.0.1 Bumps [web-vitals](https://github.com/GoogleChrome/web-vitals) from 3.5.2 to 4.0.1. - [Changelog](https://github.com/GoogleChrome/web-vitals/blob/main/CHANGELOG.md) - [Commits](https://github.com/GoogleChrome/web-vitals/compare/v3.5.2...v4.0.1) --- updated-dependencies: - dependency-name: web-vitals dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fa858f760..0f80c9d73 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "stylelint-prettier": "^3.0.0", "stylelint-scss": "^5.3.2", "typescript": "^4.7.4", - "web-vitals": "^3.5.2" + "web-vitals": "^4.0.1" }, "publishConfig": { "registry": "https://npm.pkg.github.com" diff --git a/yarn.lock b/yarn.lock index a551b7e9d..b79fc66c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16340,10 +16340,10 @@ web-namespaces@^1.0.0: resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== -web-vitals@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-3.5.2.tgz#5bb58461bbc173c3f00c2ddff8bfe6e680999ca9" - integrity sha512-c0rhqNcHXRkY/ogGDJQxZ9Im9D19hDihbzSQJrsioex+KnFgmMzBiy57Z1EjkhX/+OjyBpclDCzz2ITtjokFmg== +web-vitals@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-4.0.1.tgz#9fa4dfcd26130d6721717c5f2ff73adf3adbbe76" + integrity sha512-AW6qT/vXK3pbf+WgVcEBXY//AWCpXjVKgdb6rt0cARSUdtT+NUtZCOeo+CSLUX7PjSQ275DmxfkAs7QlPbtR6w== webidl-conversions@^3.0.0: version "3.0.1" From ac3da3f73f05452d49f54c9599b3ab339b819fb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 01:29:27 +0000 Subject: [PATCH 7/8] Bump eslint-webpack-plugin from 4.1.0 to 4.2.0 Bumps [eslint-webpack-plugin](https://github.com/webpack-contrib/eslint-webpack-plugin) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/webpack-contrib/eslint-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/eslint-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/eslint-webpack-plugin/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: eslint-webpack-plugin dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index fa858f760..8a8de7b9f 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.34.1", "eslint-plugin-react-hooks": "^4.6.2", - "eslint-webpack-plugin": "^4.1.0", + "eslint-webpack-plugin": "^4.2.0", "flatpickr": "^4.6.13", "json": "^11.0.0", "markdownlint-cli2": "^0.4.0", diff --git a/yarn.lock b/yarn.lock index a551b7e9d..40f11431e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2952,10 +2952,10 @@ "@types/eslint" "*" "@types/estree" "*" -"@types/eslint@*", "@types/eslint@^8.56.5": - version "8.56.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.6.tgz#d5dc16cac025d313ee101108ba5714ea10eb3ed0" - integrity sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A== +"@types/eslint@*", "@types/eslint@^8.56.10": + version "8.56.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" + integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -7319,12 +7319,12 @@ eslint-webpack-plugin@^2.5.2: normalize-path "^3.0.0" schema-utils "^3.1.1" -eslint-webpack-plugin@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-4.1.0.tgz#83daf1e601ea57b63d7164eea0635d7b7bafe673" - integrity sha512-C3wAG2jyockIhN0YRLuKieKj2nx/gnE/VHmoHemD5ifnAtY6ZU+jNPfzPoX4Zd6RIbUyWTiZUh/ofUlBhoAX7w== +eslint-webpack-plugin@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-4.2.0.tgz#41f54b25379908eb9eca8645bc997c90cfdbd34e" + integrity sha512-rsfpFQ01AWQbqtjgPRr2usVRxhWDuG0YDYcG8DJOteD3EFnpeuYuOwk0PQiN7PRBTqS6ElNdtPZPggj8If9WnA== dependencies: - "@types/eslint" "^8.56.5" + "@types/eslint" "^8.56.10" jest-worker "^29.7.0" micromatch "^4.0.5" normalize-path "^3.0.0" From 9ddc8049f54b089d28dcfe6b2965e5473fea4944 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 10:58:48 +0000 Subject: [PATCH 8/8] Bump sass from 1.77.1 to 1.77.2 Bumps [sass](https://github.com/sass/dart-sass) from 1.77.1 to 1.77.2. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.77.1...1.77.2) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1758595de..a97faf300 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "react-dom": "^17.0.2", "react-helmet": "^6.1.0", "react-scripts": "^4.0.3", - "sass": "^1.77.1", + "sass": "^1.77.2", "skeleton-screen-css": "^1.1.0", "storybook-addon-designs": "^6.2.1", "stylelint": "^14.16.1", diff --git a/yarn.lock b/yarn.lock index ef648e454..506a38c08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14288,10 +14288,10 @@ sass-loader@^10.0.5: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.77.1: - version "1.77.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.1.tgz#018cdfb206afd14724030c02e9fefd8f30a76cd0" - integrity sha512-OMEyfirt9XEfyvocduUIOlUSkWOXS/LAt6oblR/ISXCTukyavjex+zQNm51pPCOiFKY1QpWvEH1EeCkgyV3I6w== +sass@^1.77.2: + version "1.77.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.2.tgz#18d4ed2eefc260cdc8099c5439ec1303fd5863aa" + integrity sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0"