Merge branch 'v4-dev' into FRONT-4372-acc-gallery

ec-europa · Nov 27, 2024 · 901776b · 901776b
2 parents cf4d77d + 8a3fded
commit 901776b
Show file tree

Hide file tree

Showing 21 changed files with 1,571 additions and 2,334 deletions.
diff --git a/package.json b/package.json
@@ -33,29 +33,29 @@
     "update-version": "scripts/update-version.sh"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "7.25.1",
-    "@babel/plugin-proposal-export-default-from": "7.24.7",
-    "@babel/plugin-transform-runtime": "7.25.4",
+    "@babel/eslint-parser": "7.25.9",
+    "@babel/plugin-proposal-export-default-from": "7.25.9",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-transform-runtime": "7.25.9",
     "@prettier/plugin-xml": "3.4.1",
-    "@size-limit/preset-big-lib": "11.1.5",
+    "@size-limit/preset-big-lib": "11.1.6",
     "babel-jest": "29.7.0",
     "classnames": "2.5.1",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-airbnb-base": "15.0.0",
-    "eslint-plugin-import": "2.30.0",
+    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jest": "27.9.0",
-    "eslint-plugin-jsx-a11y": "6.10.0",
+    "eslint-plugin-jsx-a11y": "6.10.2",
     "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-react": "7.35.2",
+    "eslint-plugin-react": "7.37.2",
     "eslint-plugin-react-hooks": "4.6.2",
     "glob": "11.0.0",
-    "husky": "9.1.5",
+    "husky": "9.1.7",
     "jest": "29.7.0",
     "jest-axe": "9.0.0",
     "jest-environment-jsdom": "29.7.0",
-    "lerna": "8.1.8",
+    "lerna": "8.1.9",
     "lerna-changelog": "2.2.0",
     "lint-staged": "15.2.10",
     "npm-run-all": "4.1.5",
@@ -66,15 +66,15 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "rimraf": "6.0.1",
-    "size-limit": "11.1.5",
-    "ssri": "10.0.6",
-    "stylelint": "16.9.0",
+    "size-limit": "11.1.6",
+    "ssri": "12.0.0",
+    "stylelint": "16.10.0",
     "stylelint-config-css-modules": "4.4.0",
     "stylelint-config-prettier": "9.0.5",
     "stylelint-config-standard": "36.0.1",
     "stylelint-config-standard-scss": "13.1.0",
     "stylelint-order": "6.0.4",
-    "stylelint-scss": "6.5.1",
+    "stylelint-scss": "6.10.0",
     "svg4everybody": "2.1.9"
   },
   "resolutions": {
@@ -114,7 +114,6 @@
     "ws": ">=8.17.1",
     "micromatch": ">=4.0.8",
     "serve-static": ">=1.16.0",
-    "send": ">=0.19.0",
     "path-to-regexp": "0.1.10"
   },
   "engines": {

diff --git a/src/implementations/vanilla/components/form-group/form-group.scss b/src/implementations/vanilla/components/form-group/form-group.scss
@@ -3,6 +3,7 @@
  */
 
 @use 'sass:map';
+@use '@ecl/vanilla-utility-screen-reader/screen-reader';
 
 // Exposed variables
 $theme: null !default;
@@ -67,8 +68,15 @@ $form-group: null !default;
   color: var(--c-er);
 }
 
-.ecl-form-label + {
-  *:not(.ecl-help-block, .ecl-feedback-message) {
-    margin-top: var(--s-xs);
-  }
+.ecl-form-label--hidden {
+  @include screen-reader.sr-only;
+}
+
+.ecl-form-label.ecl-form-label--hidden + * {
+  margin-top: 0;
+}
+
+.ecl-form-label:not(.ecl-form-label--hidden)
+  + *:not(.ecl-help-block, .ecl-feedback-message) {
+  margin-top: var(--s-xs);
 }
diff --git a/src/implementations/vanilla/components/form-group/package.json b/src/implementations/vanilla/components/form-group/package.json
@@ -16,6 +16,9 @@
     "type": "git",
     "url": "git+https://github.com/ec-europa/europa-component-library.git"
   },
+  "dependencies": {
+    "@ecl/vanilla-utility-screen-reader": "4.8.1"
+  },
   "bugs": {
     "url": "https://github.com/ec-europa/europa-component-library/issues"
   },

diff --git a/src/implementations/vanilla/components/gallery/package.json b/src/implementations/vanilla/components/gallery/package.json
@@ -12,7 +12,7 @@
     "@ecl/dom-utils": "4.8.1",
     "@ecl/vanilla-layout-grid": "4.8.1",
     "@ecl/vanilla-utility-screen-reader": "4.8.1",
-    "focus-trap": "7.6.1"
+    "focus-trap": "7.6.2"
   },
   "publishConfig": {
     "access": "public"

diff --git a/src/implementations/vanilla/components/inpage-navigation/package.json b/src/implementations/vanilla/components/inpage-navigation/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@ecl/dom-utils": "4.8.1",
     "@ecl/vanilla-layout-grid": "4.8.1",
-    "focus-trap": "7.6.1",
+    "focus-trap": "7.6.2",
     "gumshoejs": "5.1.2",
     "stickyfilljs": "2.1.0"
   },

diff --git a/src/implementations/vanilla/components/modal/package.json b/src/implementations/vanilla/components/modal/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@ecl/dom-utils": "4.8.1",
     "@ecl/vanilla-layout-grid": "4.8.1",
-    "focus-trap": "7.6.1"
+    "focus-trap": "7.6.2"
   },
   "publishConfig": {
     "access": "public"

diff --git a/src/implementations/vanilla/components/site-header/package.json b/src/implementations/vanilla/components/site-header/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@ecl/dom-utils": "4.8.1",
     "@ecl/vanilla-layout-grid": "4.8.1",
-    "focus-trap": "7.6.1"
+    "focus-trap": "7.6.2"
   },
   "publishConfig": {
     "access": "public"

diff --git a/src/playground/addons/storybook-addon-code/package.json b/src/playground/addons/storybook-addon-code/package.json
@@ -6,10 +6,10 @@
   "private": true,
   "dependencies": {
     "@ecl/builder": "4.8.1",
-    "@storybook/components": "8.4.2",
-    "@storybook/manager-api": "8.4.2",
-    "@storybook/preview-api": "8.4.2",
-    "@storybook/theming": "8.4.2",
+    "@storybook/components": "8.4.5",
+    "@storybook/manager-api": "8.4.5",
+    "@storybook/preview-api": "8.4.5",
+    "@storybook/theming": "8.4.5",
     "html-entities": "2.5.2",
     "js-beautify": "1.15.1",
     "prop-types": "15.8.1",

diff --git a/src/playground/addons/storybook-addon-notes/package.json b/src/playground/addons/storybook-addon-notes/package.json
@@ -5,10 +5,10 @@
   "main": "index.js",
   "private": true,
   "dependencies": {
-    "@emotion/react": "11.13.3",
-    "@emotion/styled": "11.13.0",
-    "@storybook/manager-api": "8.4.2",
-    "@storybook/preview-api": "8.4.2",
+    "@emotion/react": "11.13.5",
+    "@emotion/styled": "11.13.5",
+    "@storybook/manager-api": "8.4.5",
+    "@storybook/preview-api": "8.4.5",
     "he": "1.2.0",
     "marked": "10.0.0",
     "prismjs": "1.29.0",

diff --git a/src/playground/addons/storybook-addon-system-switcher/package.json b/src/playground/addons/storybook-addon-system-switcher/package.json
@@ -9,9 +9,9 @@
   ],
   "dependencies": {
     "@ecl/builder": "4.8.1",
-    "@storybook/components": "8.4.2",
-    "@storybook/manager-api": "8.4.2",
-    "@storybook/preview-api": "8.4.2",
+    "@storybook/components": "8.4.5",
+    "@storybook/manager-api": "8.4.5",
+    "@storybook/preview-api": "8.4.5",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   }

diff --git a/src/playground/ec/package.json b/src/playground/ec/package.json
@@ -15,14 +15,14 @@
     "@babel/preset-react": "7.25.9",
     "@babel/runtime": "7.26.0",
     "@iframe-resizer/child": "5.3.2",
-    "@storybook/addon-a11y": "8.4.2",
+    "@storybook/addon-a11y": "8.4.5",
     "@storybook/addon-cssresources": "6.2.9",
-    "@storybook/addon-essentials": "8.4.2",
-    "@storybook/addon-links": "8.4.2",
-    "@storybook/builder-webpack5": "8.4.2",
-    "@storybook/cli": "8.4.2",
-    "@storybook/html": "8.4.2",
-    "@storybook/html-webpack5": "8.4.2",
+    "@storybook/addon-essentials": "8.4.5",
+    "@storybook/addon-links": "8.4.5",
+    "@storybook/builder-webpack5": "8.4.5",
+    "@storybook/cli": "8.4.5",
+    "@storybook/html": "8.4.5",
+    "@storybook/html-webpack5": "8.4.5",
     "babel-loader": "9.2.1",
     "browser-update": "3.3.55",
     "buffer": "6.0.3",

diff --git a/src/playground/eu/package.json b/src/playground/eu/package.json
@@ -15,14 +15,14 @@
     "@babel/preset-react": "7.25.9",
     "@babel/runtime": "7.26.0",
     "@iframe-resizer/child": "5.3.2",
-    "@storybook/addon-a11y": "8.4.2",
+    "@storybook/addon-a11y": "8.4.5",
     "@storybook/addon-cssresources": "6.2.9",
-    "@storybook/addon-essentials": "8.4.2",
-    "@storybook/addon-links": "8.4.2",
-    "@storybook/builder-webpack5": "8.4.2",
-    "@storybook/cli": "8.4.2",
-    "@storybook/html": "8.4.2",
-    "@storybook/html-webpack5": "8.4.2",
+    "@storybook/addon-essentials": "8.4.5",
+    "@storybook/addon-links": "8.4.5",
+    "@storybook/builder-webpack5": "8.4.5",
+    "@storybook/cli": "8.4.5",
+    "@storybook/html": "8.4.5",
+    "@storybook/html-webpack5": "8.4.5",
     "babel-loader": "9.2.1",
     "browser-update": "3.3.55",
     "buffer": "6.0.3",

diff --git a/src/tools/builder/package.json b/src/tools/builder/package.json
@@ -25,13 +25,13 @@
     "postcss": "8.4.49",
     "postcss-banner": "4.0.1",
     "postcss-input-range": "6.0.0",
-    "rollup": "4.26.0",
+    "rollup": "4.27.4",
     "rollup-plugin-babel": "4.4.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-svg": "2.0.0",
     "rollup-plugin-uglify": "6.0.4",
-    "sass": "1.80.7"
+    "sass": "1.81.0"
   },
   "engines": {
     "node": ">=18.12.0"

diff --git a/src/website/package.json b/src/website/package.json
@@ -89,7 +89,7 @@
     "remark-gfm": "1.0.0",
     "remark-unwrap-images": "2.1.0",
     "rimraf": "6.0.1",
-    "sass": "1.80.7",
+    "sass": "1.81.0",
     "sass-loader": "16.0.3",
     "serve": "14.2.4",
     "style-loader": "4.0.0",

diff --git a/src/website/src/pages/ec/components/navigation/mega-menu/demo/index.js b/src/website/src/pages/ec/components/navigation/mega-menu/demo/index.js
@@ -1,8 +1,11 @@
 import dataFull from '@ecl/specs-component-site-header/demo/data--ec';
+import dataMegaMenu from '@ecl/specs-component-mega-menu/demo/data';
 import template from '@ecl/twig-component-site-header/site-header.html.twig';
 import { correctSvgPath } from '@ecl/website-utils';
 
-const dataCore = JSON.parse(JSON.stringify(dataFull));
+const dataWithMenu = { ...dataFull, mega_menu: dataMegaMenu };
+
+const dataCore = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataCore.login_box;
 delete dataCore.site_name;
 delete dataCore.banner_top;

diff --git a/src/website/src/pages/ec/components/navigation/menu/demo/index.js b/src/website/src/pages/ec/components/navigation/menu/demo/index.js
@@ -1,8 +1,11 @@
 import dataFull from '@ecl/specs-component-site-header/demo/data--ec';
+import dataMenu from '@ecl/specs-component-menu/demo/data--ec';
 import template from '@ecl/twig-component-site-header/site-header.html.twig';
 import { correctSvgPath } from '@ecl/website-utils';
 
-const dataCore = JSON.parse(JSON.stringify(dataFull));
+const dataWithMenu = { ...dataFull, menu: dataMenu };
+
+const dataCore = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataCore.login_box;
 delete dataCore.site_name;
 delete dataCore.banner_top;

diff --git a/src/website/src/pages/ec/components/site-wide/site-header/demo/index.js b/src/website/src/pages/ec/components/site-wide/site-header/demo/index.js
@@ -1,22 +1,25 @@
 import dataFull from '@ecl/specs-component-site-header/demo/data--ec';
+import dataMegaMenu from '@ecl/specs-component-mega-menu/demo/data';
 import template from '@ecl/twig-component-site-header/site-header.html.twig';
 import { correctSvgPath } from '@ecl/website-utils';
 
+const dataWithMenu = { ...dataFull, mega_menu: dataMegaMenu };
+
 // Core
-const dataCore = JSON.parse(JSON.stringify(dataFull));
+const dataCore = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataCore.login_box;
 delete dataCore.site_name;
 delete dataCore.banner_top;
 delete dataCore.cta_link;
-dataCore.has_menu = false;
+dataCore.has_menu = true;
 
 // Standardised
-const dataStandardised = JSON.parse(JSON.stringify(dataFull));
+const dataStandardised = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataStandardised.login_box;
 dataStandardised.has_menu = true;
 
 // Harmonised
-const dataHarmonised = JSON.parse(JSON.stringify(dataFull));
+const dataHarmonised = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataHarmonised.banner_top;
 dataHarmonised.has_menu = true;
 

diff --git a/src/website/src/pages/eu/components/navigation/mega-menu/demo/index.js b/src/website/src/pages/eu/components/navigation/mega-menu/demo/index.js
@@ -1,8 +1,11 @@
 import dataFull from '@ecl/specs-component-site-header/demo/data--eu';
+import dataMegaMenu from '@ecl/specs-component-mega-menu/demo/data';
 import template from '@ecl/twig-component-site-header/site-header.html.twig';
 import { correctSvgPath } from '@ecl/website-utils';
 
-const dataCore = JSON.parse(JSON.stringify(dataFull));
+const dataWithMenu = { ...dataFull, mega_menu: dataMegaMenu };
+
+const dataCore = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataCore.login_box;
 delete dataCore.site_name;
 delete dataCore.banner_top;

diff --git a/src/website/src/pages/eu/components/navigation/menu/demo/index.js b/src/website/src/pages/eu/components/navigation/menu/demo/index.js
@@ -1,8 +1,11 @@
 import dataFull from '@ecl/specs-component-site-header/demo/data--eu';
+import dataMenu from '@ecl/specs-component-menu/demo/data--eu';
 import template from '@ecl/twig-component-site-header/site-header.html.twig';
 import { correctSvgPath } from '@ecl/website-utils';
 
-const dataCore = JSON.parse(JSON.stringify(dataFull));
+const dataWithMenu = { ...dataFull, menu: dataMenu };
+
+const dataCore = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataCore.login_box;
 delete dataCore.site_name;
 delete dataCore.banner_top;

diff --git a/src/website/src/pages/eu/components/site-wide/site-header/demo/index.js b/src/website/src/pages/eu/components/site-wide/site-header/demo/index.js
@@ -1,17 +1,20 @@
 import dataFull from '@ecl/specs-component-site-header/demo/data--eu';
+import dataMenu from '@ecl/specs-component-menu/demo/data--eu';
 import template from '@ecl/twig-component-site-header/site-header.html.twig';
 import { correctSvgPath } from '@ecl/website-utils';
 
+const dataWithMenu = { ...dataFull, menu: dataMenu };
+
 // Core
-const dataCore = JSON.parse(JSON.stringify(dataFull));
+const dataCore = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataCore.login_box;
 delete dataCore.site_name;
 delete dataCore.banner_top;
 delete dataCore.cta_link;
-dataCore.has_menu = false;
+dataCore.has_menu = true;
 
 // Harmonised
-const dataHarmonised = JSON.parse(JSON.stringify(dataFull));
+const dataHarmonised = JSON.parse(JSON.stringify(dataWithMenu));
 delete dataHarmonised.banner_top;
 dataHarmonised.has_menu = true;