From 435954bcf87400945e6110aa6938171b2f5ac783 Mon Sep 17 00:00:00 2001 From: Amir Baghdoust Date: Tue, 26 Nov 2024 14:35:47 +0100 Subject: [PATCH] Merge branch 'main' into release (#2373) * chore: update CODEOWNERS file (#2368) * fix(nav-item): makes nav-itemcomponent respect the active=false (#2364) * fix(drop-down): fixes hidden input in dropdown-select with null check (#2361) * fix(nav-item): add null check for child element before setting role to menuitem (#2369) Co-authored-by: Amir Ashkan Baghdoust * chore(release): publish (#2372) --------- Co-authored-by: Arturo Castillo Delgado Co-authored-by: tshimber <110041439+tshimber@users.noreply.github.com> Co-authored-by: Amir Ashkan Baghdoust --- CHANGELOG.md | 14 ++++++++++++++ CODEOWNERS | 2 +- lerna.json | 2 +- packages/components-angular/CHANGELOG.md | 9 +++++++++ packages/components-angular/package.json | 2 +- packages/components-react/CHANGELOG.md | 9 +++++++++ packages/components-react/package.json | 2 +- packages/components-vue/CHANGELOG.md | 9 +++++++++ packages/components-vue/package.json | 2 +- packages/components/CHANGELOG.md | 14 ++++++++++++++ packages/components/package.json | 2 +- .../dropdown-select/dropdown-select.tsx | 3 +++ .../telekom-nav-item/telekom-nav-item.css | 18 +++++++++--------- .../telekom-nav-item/telekom-nav-item.tsx | 2 +- .../components/src/html/dropdown-select.html | 2 +- .../components/src/html/telekom-header.html | 2 +- packages/design-tokens/CHANGELOG.md | 9 +++++++++ packages/design-tokens/package.json | 2 +- packages/storybook-vue/CHANGELOG.md | 9 +++++++++ packages/storybook-vue/package.json | 6 +++--- packages/visual-tests/CHANGELOG.md | 9 +++++++++ packages/visual-tests/package.json | 2 +- 22 files changed, 108 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9d3d79f35..1f96d1b343 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.0.0-beta.155](https://github.com/amir-ba/scale/compare/v3.0.0-beta.154...v3.0.0-beta.155) (2024-11-26) + + +### Bug Fixes + +* **drop-down:** fixes hidden input in dropdown-select with null check ([#2361](https://github.com/amir-ba/scale/issues/2361)) ([8a04a5e](https://github.com/amir-ba/scale/commit/8a04a5e8c0bb3b72a2fbb90822600f6b8feefc06)) +* **nav-item:** add null check for child element before setting role to menuitem ([#2369](https://github.com/amir-ba/scale/issues/2369)) ([5fd16f1](https://github.com/amir-ba/scale/commit/5fd16f1d9f3f5259c004ae6f155117150ee8a0a3)) +* **nav-item:** makes nav-itemcomponent respect the active=false ([#2364](https://github.com/amir-ba/scale/issues/2364)) ([9a999fb](https://github.com/amir-ba/scale/commit/9a999fb298f481d7d94dd430434678021acb007c)) + + + + + + # [3.0.0-beta.154](https://github.com/amir-ba/scale/compare/v3.0.0-beta.152...v3.0.0-beta.154) (2024-11-06) diff --git a/CODEOWNERS b/CODEOWNERS index ecdd717c39..a5792c0651 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -5,4 +5,4 @@ # For more details, read the following article on GitHub: https://help.github.com/articles/about-codeowners/. # These are the default owners for the whole content of this repository. The default owners are automatically added as reviewers when you open a pull request, unless different owners are specified in the file. -* @maomaoZH @acstll @felix-ico +* @maomaoZH @amir-ba diff --git a/lerna.json b/lerna.json index 4715d803df..7de19fd0c6 100644 --- a/lerna.json +++ b/lerna.json @@ -7,7 +7,7 @@ "--pure-lockfile" ], "useWorkspaces": true, - "version": "3.0.0-beta.154", + "version": "3.0.0-beta.155", "command": { "version": { "allowBranch": "main" diff --git a/packages/components-angular/CHANGELOG.md b/packages/components-angular/CHANGELOG.md index 09d006c99a..7e333a11af 100644 --- a/packages/components-angular/CHANGELOG.md +++ b/packages/components-angular/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.0.0-beta.155](https://github.com/telekom/scale/compare/v3.0.0-beta.154...v3.0.0-beta.155) (2024-11-26) + +**Note:** Version bump only for package @telekom/scale-components-angular + + + + + + # [3.0.0-beta.154](https://github.com/telekom/scale/compare/v3.0.0-beta.152...v3.0.0-beta.154) (2024-11-06) **Note:** Version bump only for package @telekom/scale-components-angular diff --git a/packages/components-angular/package.json b/packages/components-angular/package.json index 579ce4ea1f..9092183081 100644 --- a/packages/components-angular/package.json +++ b/packages/components-angular/package.json @@ -1,6 +1,6 @@ { "name": "@telekom/scale-components-angular", - "version": "3.0.0-beta.154", + "version": "3.0.0-beta.155", "description": "Angular specific wrapper for @telekom/scale-components", "license": "MPL-2.0", "homepage": "https://github.com/telekom/scale", diff --git a/packages/components-react/CHANGELOG.md b/packages/components-react/CHANGELOG.md index ea74e3edcf..4542fc85ef 100644 --- a/packages/components-react/CHANGELOG.md +++ b/packages/components-react/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.0.0-beta.155](https://github.com/telekom/scale/compare/v3.0.0-beta.154...v3.0.0-beta.155) (2024-11-26) + +**Note:** Version bump only for package @telekom/scale-components-react + + + + + + # [3.0.0-beta.154](https://github.com/telekom/scale/compare/v3.0.0-beta.152...v3.0.0-beta.154) (2024-11-06) **Note:** Version bump only for package @telekom/scale-components-react diff --git a/packages/components-react/package.json b/packages/components-react/package.json index e33d80ebe6..d188ca76c3 100755 --- a/packages/components-react/package.json +++ b/packages/components-react/package.json @@ -1,7 +1,7 @@ { "name": "@telekom/scale-components-react", "sideEffects": false, - "version": "3.0.0-beta.154", + "version": "3.0.0-beta.155", "description": "React proxy for @telekom/scale-components", "license": "MPL-2.0", "homepage": "https://github.com/telekom/scale", diff --git a/packages/components-vue/CHANGELOG.md b/packages/components-vue/CHANGELOG.md index 99547288dd..e18162d68d 100644 --- a/packages/components-vue/CHANGELOG.md +++ b/packages/components-vue/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.0.0-beta.155](https://github.com/telekom/scale/compare/v3.0.0-beta.154...v3.0.0-beta.155) (2024-11-26) + +**Note:** Version bump only for package @telekom/scale-components-vue + + + + + + # [3.0.0-beta.154](https://github.com/telekom/scale/compare/v3.0.0-beta.152...v3.0.0-beta.154) (2024-11-06) **Note:** Version bump only for package @telekom/scale-components-vue diff --git a/packages/components-vue/package.json b/packages/components-vue/package.json index e7fc109275..208130d1d2 100644 --- a/packages/components-vue/package.json +++ b/packages/components-vue/package.json @@ -1,7 +1,7 @@ { "name": "@telekom/scale-components-vue", "sideEffects": false, - "version": "3.0.0-beta.154", + "version": "3.0.0-beta.155", "description": "Vue specific wrapper for @telekom/scale-components", "license": "MPL-2.0", "homepage": "https://github.com/telekom/scale", diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index e3fe456044..523dca5bae 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.0.0-beta.155](https://github.com/telekom/scale/compare/v3.0.0-beta.154...v3.0.0-beta.155) (2024-11-26) + + +### Bug Fixes + +* **drop-down:** fixes hidden input in dropdown-select with null check ([#2361](https://github.com/telekom/scale/issues/2361)) ([8a04a5e](https://github.com/telekom/scale/commit/8a04a5e8c0bb3b72a2fbb90822600f6b8feefc06)) +* **nav-item:** add null check for child element before setting role to menuitem ([#2369](https://github.com/telekom/scale/issues/2369)) ([5fd16f1](https://github.com/telekom/scale/commit/5fd16f1d9f3f5259c004ae6f155117150ee8a0a3)) +* **nav-item:** makes nav-itemcomponent respect the active=false ([#2364](https://github.com/telekom/scale/issues/2364)) ([9a999fb](https://github.com/telekom/scale/commit/9a999fb298f481d7d94dd430434678021acb007c)) + + + + + + # [3.0.0-beta.154](https://github.com/telekom/scale/compare/v3.0.0-beta.152...v3.0.0-beta.154) (2024-11-06) diff --git a/packages/components/package.json b/packages/components/package.json index 5ab2660dd9..41260605e9 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@telekom/scale-components", - "version": "3.0.0-beta.154", + "version": "3.0.0-beta.155", "description": "Scale is the digital design system for Telekom products and experiences.", "homepage": "https://github.com/telekom/scale", "repository": { diff --git a/packages/components/src/components/dropdown-select/dropdown-select.tsx b/packages/components/src/components/dropdown-select/dropdown-select.tsx index 2c8e429f00..600d644165 100644 --- a/packages/components/src/components/dropdown-select/dropdown-select.tsx +++ b/packages/components/src/components/dropdown-select/dropdown-select.tsx @@ -329,6 +329,9 @@ export class DropdownSelect { } updateInputHidden(value: string = this.value): void { + if (!this.hiddenInput) { + return; + } this.hiddenInput.value = value; } diff --git a/packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.css b/packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.css index 86a00b32ea..bda5046c0d 100644 --- a/packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.css +++ b/packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.css @@ -168,14 +168,14 @@ } .scale-telekom-nav-list[variant='main-nav'] - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button), .scale-telekom-nav-list[variant='main-nav'] > scale-menu-flyout - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button), .scale-telekom-nav-list[variant='main-nav'] - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button) { color: var(--telekom-color-text-and-icon-primary-standard); } @@ -255,14 +255,14 @@ } .scale-telekom-nav-list[variant='main-nav'] - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button):after, .scale-telekom-nav-list[variant='functions'] - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button):after, .scale-telekom-nav-list[variant='main-nav'] > scale-menu-flyout - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button):after { content: ''; height: var(--telekom-spacing-composition-space-03); @@ -277,14 +277,14 @@ @media screen and (forced-colors: active), (-ms-high-contrast: active) { .scale-telekom-nav-list[variant='main-nav'] - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button), .scale-telekom-nav-list[variant='functions'] - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button), .scale-telekom-nav-list[variant='main-nav'] > scale-menu-flyout - > .scale-telekom-nav-item[active] + > .scale-telekom-nav-item[active]:not([active='false']) > :where(a, button) { border-bottom: 2px solid hsl(0, 0%, 100%); } diff --git a/packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.tsx b/packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.tsx index abf898fc15..7b26549d39 100644 --- a/packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.tsx +++ b/packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.tsx @@ -71,7 +71,7 @@ export class TelekomNavItem { el.matches('a, button') ); const parentRole = this.hostElement.parentElement?.getAttribute('role'); - if (parentRole === 'menu') { + if (child && parentRole === 'menu') { child.setAttribute('role', 'menuitem'); } } diff --git a/packages/components/src/html/dropdown-select.html b/packages/components/src/html/dropdown-select.html index bbb0ebf20b..6a66117b48 100644 --- a/packages/components/src/html/dropdown-select.html +++ b/packages/components/src/html/dropdown-select.html @@ -23,7 +23,7 @@ - + - + Topic Three diff --git a/packages/design-tokens/CHANGELOG.md b/packages/design-tokens/CHANGELOG.md index 25682a59b5..abb5ceca3d 100644 --- a/packages/design-tokens/CHANGELOG.md +++ b/packages/design-tokens/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.0.0-beta.155](https://github.com/telekom/scale/compare/v3.0.0-beta.154...v3.0.0-beta.155) (2024-11-26) + +**Note:** Version bump only for package @telekom/scale-design-tokens + + + + + + # [3.0.0-beta.154](https://github.com/telekom/scale/compare/v3.0.0-beta.152...v3.0.0-beta.154) (2024-11-06) **Note:** Version bump only for package @telekom/scale-design-tokens diff --git a/packages/design-tokens/package.json b/packages/design-tokens/package.json index 78abee5353..511286f10f 100644 --- a/packages/design-tokens/package.json +++ b/packages/design-tokens/package.json @@ -1,6 +1,6 @@ { "name": "@telekom/scale-design-tokens", - "version": "3.0.0-beta.154", + "version": "3.0.0-beta.155", "type": "module", "description": "Design Tokens for the Scale Design System", "homepage": "https://github.com/telekom/scale", diff --git a/packages/storybook-vue/CHANGELOG.md b/packages/storybook-vue/CHANGELOG.md index dc9a575594..4cddb9a53e 100644 --- a/packages/storybook-vue/CHANGELOG.md +++ b/packages/storybook-vue/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.0.0-beta.155](https://github.com/amir-ba/scale/compare/v3.0.0-beta.154...v3.0.0-beta.155) (2024-11-26) + +**Note:** Version bump only for package @telekom/scale-storybook-vue + + + + + + # [3.0.0-beta.154](https://github.com/amir-ba/scale/compare/v3.0.0-beta.152...v3.0.0-beta.154) (2024-11-06) diff --git a/packages/storybook-vue/package.json b/packages/storybook-vue/package.json index a87631faaf..9e6bb4689a 100644 --- a/packages/storybook-vue/package.json +++ b/packages/storybook-vue/package.json @@ -2,7 +2,7 @@ "homepage": "https://telekom.github.io/scale", "name": "@telekom/scale-storybook-vue", "private": true, - "version": "3.0.0-beta.154", + "version": "3.0.0-beta.155", "main": "index.js", "license": "MPL-2.0", "devDependencies": { @@ -32,8 +32,8 @@ "dependencies": { "@storybook/addon-viewport": "^6.4.22", "@telekom/design-tokens": "^1.0.0-beta.2", - "@telekom/scale-components": "^3.0.0-beta.154", - "@telekom/scale-components-vue": "^3.0.0-beta.154" + "@telekom/scale-components": "^3.0.0-beta.155", + "@telekom/scale-components-vue": "^3.0.0-beta.155" }, "scripts": { "prestart": "rm -rf node_modules/.cache/ && yes | cp -a ../components/dist/scale-components/fonts/* public/fonts/ && yes | cp -a ../components/dist/scale-components/scale-components.css public/", diff --git a/packages/visual-tests/CHANGELOG.md b/packages/visual-tests/CHANGELOG.md index a9e48e8479..8fdb6009d7 100644 --- a/packages/visual-tests/CHANGELOG.md +++ b/packages/visual-tests/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.0.0-beta.155](https://github.com/amir-ba/scale/compare/v3.0.0-beta.154...v3.0.0-beta.155) (2024-11-26) + +**Note:** Version bump only for package @telekom/scale-visual-tests + + + + + + # [3.0.0-beta.154](https://github.com/amir-ba/scale/compare/v3.0.0-beta.152...v3.0.0-beta.154) (2024-11-06) **Note:** Version bump only for package @telekom/scale-visual-tests diff --git a/packages/visual-tests/package.json b/packages/visual-tests/package.json index 7b35faa26a..c6ec381f16 100644 --- a/packages/visual-tests/package.json +++ b/packages/visual-tests/package.json @@ -1,7 +1,7 @@ { "name": "@telekom/scale-visual-tests", "private": true, - "version": "3.0.0-beta.154", + "version": "3.0.0-beta.155", "main": "index.js", "license": "MPL-2.0", "scripts": {