Skip to content

Commit

Permalink
Merge pull request #39 from ec-europa/FRONT-4087-3-10
Browse files Browse the repository at this point in the history
chore: Aligning component to ECL 3.10.0
  • Loading branch information
planctus authored Sep 21, 2023
2 parents 8d2a676 + 4ec7b80 commit 4e46e1f
Show file tree
Hide file tree
Showing 79 changed files with 520 additions and 227 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ index edd25b9..0c98c60 100755
});

diff --git a/node_modules/@ecl/builder/scripts/copy.js b/node_modules/@ecl/builder/scripts/copy.js
index 30019d2..30e38be 100644
index 30019d2..3bfefde 100644
--- a/node_modules/@ecl/builder/scripts/copy.js
+++ b/node_modules/@ecl/builder/scripts/copy.js
@@ -1,23 +1,32 @@
Expand All @@ -37,7 +37,7 @@ index 30019d2..30e38be 100644
+ * },
+ * ],
+ */

-const copy = promisify(ncp);

-module.exports = (patterns, from, to) => {
Expand All @@ -50,7 +50,7 @@ index 30019d2..30e38be 100644
+const fs = require("fs");
+const path = require("path");
+const copy = require("copyfiles");

- fs.mkdirSync(path.dirname(dest), { recursive: true });
- await copy(input, dest);
- });
Expand Down
File renamed without changes.
13 changes: 0 additions & 13 deletions patches/@ecl+vanilla-component-carousel+3.9.1.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/@ecl/vanilla-component-category-filter/category-filter.js b/node_modules/@ecl/vanilla-component-category-filter/category-filter.js
index 76b4353..3f86846 100644
index 76b4353..ed7da7d 100644
--- a/node_modules/@ecl/vanilla-component-category-filter/category-filter.js
+++ b/node_modules/@ecl/vanilla-component-category-filter/category-filter.js
@@ -90,21 +90,24 @@ export class CategoryFilter {
Expand Down Expand Up @@ -27,7 +27,7 @@ index 76b4353..3f86846 100644
return;
}
}

- this.items.forEach((item) => {
+ this.items.forEach(function (item) {
if (item === treeItem) {
Expand Down
5 changes: 2 additions & 3 deletions playground/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
</style>
<link
rel="stylesheet"
href="https://cdn1.fpfis.tech.ec.europa.eu/ecl/v3.9.1/ec/styles/ecl-ec.css"
integrity="sha256-0zRqC/6eLuVDDye5qE8BFP258QkL1B0rm2kFIv9QNZw= sha384-lM8ckpRRZXbx9MZOw2alQ5IgNRzx6dIAHZYK/kTR19IYoz67xoDLQyWkLdhQaSUO
sha512-B7VbIvT5ZvN/Beo0ZbigT4NgCaLzx4QCLJQOnINY5R3P5qro04ckYu8d45ILtBrUORTM//TM2YgMpkoq0ZmjVg=="
href="https://cdn1.fpfis.tech.ec.europa.eu/ecl/v3.10.0/ec/styles/ecl-ec.css"
integrity="sha256-LkZQ/rExnBl8MVHlJJ78lfS2CLPbGwgDvYDxsyUBeEs= sha384-lXBeCnbcwbqBiz1jbDX8TDGLDkOphNbczm554BVXhhilIpDCZfusJStxpuLl7eiD sha512-XZxRYBGAF7s3y+bakiQuu6F6PFn7uGl+qmgiFs84VkkV+cop0I11fnrzOqWv6tyfs6DsGuz8mz1Q8xN1nSdTvw=="
crossorigin="anonymous"
media="screen"
/>
Expand Down
8 changes: 8 additions & 0 deletions src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ export namespace Components {
}
interface EclAccordionItem {
"expanded": boolean;
"itemId": string;
"label": string;
"styleClass": string;
"theme": string;
"titleId": string;
}
interface EclBanner {
"bannerTitle": string;
Expand Down Expand Up @@ -296,6 +298,7 @@ export namespace Components {
"theme": string;
}
interface EclGallery {
"ariaLabel": string;
"closeLabel": string;
"counterLabel": string;
"counterSeparator": string;
Expand Down Expand Up @@ -358,6 +361,7 @@ export namespace Components {
"sprite": string;
"styleClass": string;
"theme": string;
"titleTag": string;
"transform": string;
}
interface EclInpageNavigation {
Expand Down Expand Up @@ -1348,9 +1352,11 @@ declare namespace LocalJSX {
}
interface EclAccordionItem {
"expanded"?: boolean;
"itemId"?: string;
"label"?: string;
"styleClass"?: string;
"theme"?: string;
"titleId"?: string;
}
interface EclBanner {
"bannerTitle"?: string;
Expand Down Expand Up @@ -1633,6 +1639,7 @@ declare namespace LocalJSX {
"theme"?: string;
}
interface EclGallery {
"ariaLabel"?: string;
"closeLabel"?: string;
"counterLabel"?: string;
"counterSeparator"?: string;
Expand Down Expand Up @@ -1695,6 +1702,7 @@ declare namespace LocalJSX {
"sprite"?: string;
"styleClass"?: string;
"theme"?: string;
"titleTag"?: string;
"transform"?: string;
}
interface EclInpageNavigation {
Expand Down
13 changes: 11 additions & 2 deletions src/components/ecl-accordion/ecl-accordion-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ export class EclAccordionItem {
@Element() el: HTMLElement;
@Prop() styleClass: string;
@Prop() label: string;
@Prop() itemId: string;
@Prop() titleId: string;
@Prop({reflect:true}) expanded: boolean;
@Prop() theme: string = 'ec';

Expand All @@ -25,8 +27,15 @@ export class EclAccordionItem {

render() {
return (
<div class={this.getClass()}>
<h3 class={`ecl-accordion__title sc-ecl-accordion-${this.theme}`}>
<div
class={this.getClass()}
id={this.itemId || null}
aria-labelledby={this.titleId || null}
>
<h3
class={`ecl-accordion__title sc-ecl-accordion-${this.theme}`}
id={this.titleId || null}
>
<button
data-ecl-accordion-toggle
aria-controls={`${this.el.id}-content`}
Expand Down
9 changes: 6 additions & 3 deletions src/components/ecl-accordion/ecl-accordion.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ const Template = (args) =>
ecl-script
>
<ecl-accordion-item
id="ecl-accordion-item-id-1"
item-id="ecl-accordion-item-id-1"
title-id="accordion-example-title-1"
label="Delivery of last pending proposals, a common Destiny of unity, the hour of European Democracy"
theme="${args.theme}"
>
Expand All @@ -18,16 +19,18 @@ const Template = (args) =>
</ecl-accordion-item>
<ecl-accordion-item
id="ecl-accordion-item-id-2"
item-id="ecl-accordion-item-id-2"
label="Energy union and climate"
title-id="accordion-example-title-2"
expanded
theme="${args.theme}"
>
A balanced and progressive trade policy to harness globalisation
</ecl-accordion-item>
<ecl-accordion-item
id="ecl-accordion-item-id-3"
item-id="ecl-accordion-item-id-3"
title-id="accordion-example-title-3"
label="Delivery of last pending proposals, a common Destiny of unity, the hour of European Democracy"
theme="${args.theme}"
>
Expand Down
20 changes: 10 additions & 10 deletions src/components/ecl-accordion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/resources-ec-icons": "3.9.1",
"@ecl/resources-eu-icons": "3.9.1",
"@ecl/specs-component-accordion": "3.9.1",
"@ecl/theme-ec": "3.9.1",
"@ecl/theme-eu": "3.9.1",
"@ecl/vanilla-component-accordion": "3.9.1",
"@ecl/vanilla-component-button": "3.9.1",
"@ecl/vanilla-component-icon": "3.9.1",
"@ecl/vanilla-layout-grid": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/resources-ec-icons": "3.10.0",
"@ecl/resources-eu-icons": "3.10.0",
"@ecl/specs-component-accordion": "3.10.0",
"@ecl/theme-ec": "3.10.0",
"@ecl/theme-eu": "3.10.0",
"@ecl/vanilla-component-accordion": "3.10.0",
"@ecl/vanilla-component-button": "3.10.0",
"@ecl/vanilla-component-icon": "3.10.0",
"@ecl/vanilla-layout-grid": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
2 changes: 2 additions & 0 deletions src/components/ecl-accordion/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
| Property | Attribute | Description | Type | Default |
| ------------ | ------------- | ----------- | --------- | ----------- |
| `expanded` | `expanded` | | `boolean` | `undefined` |
| `itemId` | `item-id` | | `string` | `undefined` |
| `label` | `label` | | `string` | `undefined` |
| `styleClass` | `style-class` | | `string` | `undefined` |
| `theme` | `theme` | | `string` | `'ec'` |
| `titleId` | `title-id` | | `string` | `undefined` |


## Dependencies
Expand Down
4 changes: 2 additions & 2 deletions src/components/ecl-banner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/vanilla-component-banner": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/vanilla-component-banner": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
8 changes: 4 additions & 4 deletions src/components/ecl-blockquote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/theme-ec": "3.9.1",
"@ecl/theme-eu": "3.9.1",
"@ecl/vanilla-component-blockquote": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/theme-ec": "3.10.0",
"@ecl/theme-eu": "3.10.0",
"@ecl/vanilla-component-blockquote": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
8 changes: 4 additions & 4 deletions src/components/ecl-breadcrumb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/theme-ec": "3.9.1",
"@ecl/theme-eu": "3.9.1",
"@ecl/vanilla-component-breadcrumb": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/theme-ec": "3.10.0",
"@ecl/theme-eu": "3.10.0",
"@ecl/vanilla-component-breadcrumb": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
18 changes: 9 additions & 9 deletions src/components/ecl-button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/resources-ec-icons": "3.9.1",
"@ecl/resources-eu-icons": "3.9.1",
"@ecl/specs-component-button": "3.9.1",
"@ecl/theme-ec": "3.9.1",
"@ecl/theme-eu": "3.9.1",
"@ecl/vanilla-component-button": "3.9.1",
"@ecl/vanilla-component-icon": "3.9.1",
"@ecl/vanilla-component-link": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/resources-ec-icons": "3.10.0",
"@ecl/resources-eu-icons": "3.10.0",
"@ecl/specs-component-button": "3.10.0",
"@ecl/theme-ec": "3.10.0",
"@ecl/theme-eu": "3.10.0",
"@ecl/vanilla-component-button": "3.10.0",
"@ecl/vanilla-component-icon": "3.10.0",
"@ecl/vanilla-component-link": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/ecl-card/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/vanilla-component-card": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/vanilla-component-card": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions src/components/ecl-carousel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/vanilla-component-carousel": "3.9.1",
"@ecl/vanilla-layout-grid": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/vanilla-component-carousel": "3.10.0",
"@ecl/vanilla-layout-grid": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/ecl-category-filter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/vanilla-component-category-filter": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/vanilla-component-category-filter": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
16 changes: 8 additions & 8 deletions src/components/ecl-content-block/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/theme-ec": "3.9.1",
"@ecl/theme-eu": "3.9.1",
"@ecl/vanilla-component-content-block": "3.9.1",
"@ecl/vanilla-component-description-list": "3.9.1",
"@ecl/vanilla-component-icon": "3.9.1",
"@ecl/vanilla-component-label": "3.9.1",
"@ecl/vanilla-component-link": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/theme-ec": "3.10.0",
"@ecl/theme-eu": "3.10.0",
"@ecl/vanilla-component-content-block": "3.10.0",
"@ecl/vanilla-component-description-list": "3.10.0",
"@ecl/vanilla-component-icon": "3.10.0",
"@ecl/vanilla-component-label": "3.10.0",
"@ecl/vanilla-component-link": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
8 changes: 4 additions & 4 deletions src/components/ecl-content-item/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/theme-ec": "3.9.1",
"@ecl/theme-eu": "3.9.1",
"@ecl/vanilla-component-content-item": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/theme-ec": "3.10.0",
"@ecl/theme-eu": "3.10.0",
"@ecl/vanilla-component-content-item": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
10 changes: 5 additions & 5 deletions src/components/ecl-date-block/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/theme-ec": "3.9.1",
"@ecl/theme-eu": "3.9.1",
"@ecl/vanilla-component-date-block": "3.9.1",
"@ecl/vanilla-utility-screen-reader": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/theme-ec": "3.10.0",
"@ecl/theme-eu": "3.10.0",
"@ecl/vanilla-component-date-block": "3.10.0",
"@ecl/vanilla-utility-screen-reader": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
8 changes: 4 additions & 4 deletions src/components/ecl-datepicker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@ecl/builder": "3.9.1",
"@ecl/theme-ec": "3.9.1",
"@ecl/theme-eu": "3.9.1",
"@ecl/vanilla-component-datepicker": "3.9.1",
"@ecl/builder": "3.10.0",
"@ecl/theme-ec": "3.10.0",
"@ecl/theme-eu": "3.10.0",
"@ecl/vanilla-component-datepicker": "3.10.0",
"cross-env": "7.0.3"
},
"repository": {
Expand Down
Loading

0 comments on commit 4e46e1f

Please sign in to comment.