Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch 'main' into release #2373

Merged
merged 5 commits into from
Nov 26, 2024
Merged

Merge branch 'main' into release #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c86ca15
chore: update CODEOWNERS file (#2368)
acstll Nov 7, 2024
9a999fb
fix(nav-item): makes nav-itemcomponent respect the active=false (#2364)
tshimber Nov 7, 2024
8a04a5e
fix(drop-down): fixes hidden input in dropdown-select with null check…
tshimber Nov 12, 2024
5fd16f1
fix(nav-item): add null check for child element before setting role t…
amir-ba Nov 21, 2024
c12df4a
chore(release): publish (#2372)
amir-ba Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"--pure-lockfile"
],
"useWorkspaces": true,
"version": "3.0.0-beta.154",
"version": "3.0.0-beta.155",
"command": {
"version": {
"allowBranch": "main"
Expand Down
9 changes: 9 additions & 0 deletions packages/components-angular/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/components-angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
9 changes: 9 additions & 0 deletions packages/components-react/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/components-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
9 changes: 9 additions & 0 deletions packages/components-vue/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/components-vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
14 changes: 14 additions & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/dropdown-select/dropdown-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@ export class DropdownSelect {
}

updateInputHidden(value: string = this.value): void {
if (!this.hiddenInput) {
return;
}
this.hiddenInput.value = value;
}

Expand Down
18 changes: 9 additions & 9 deletions packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand All @@ -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%);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/telekom/telekom-nav-item/telekom-nav-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/html/dropdown-select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</style>
</head>

<body data-mode="dark" style="height: 200vh; background: black">
<body style="height: 200vh">
<scale-dropdown-select
label="Favorite person"
id="person-select"
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/html/telekom-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
</scale-telekom-mega-menu>
</scale-telekom-nav-flyout>
</scale-telekom-nav-item>
<scale-telekom-nav-item>
<scale-telekom-nav-item active="false">
<a href="#">Topic Three</a>
</scale-telekom-nav-item>
<scale-telekom-nav-item>
Expand Down
9 changes: 9 additions & 0 deletions packages/design-tokens/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/design-tokens/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
9 changes: 9 additions & 0 deletions packages/storybook-vue/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
6 changes: 3 additions & 3 deletions packages/storybook-vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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/",
Expand Down
9 changes: 9 additions & 0 deletions packages/visual-tests/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/visual-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Loading