Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
felixw committed Sep 6, 2023
2 parents 8552d60 + 2ada623 commit 8ce3a6e
Show file tree
Hide file tree
Showing 25 changed files with 143 additions and 29 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
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.139](https://github.com/telekom/scale/compare/v3.0.0-beta.138...v3.0.0-beta.139) (2023-09-06)


### Bug Fixes

* ignore blur when inside a tab panel ([#2111](https://github.com/telekom/scale/issues/2111)) ([3de029b](https://github.com/telekom/scale/commit/3de029b92458e135b9eafa3a7ed7015503fe41a7))
* set aria live on body part ([#2116](https://github.com/telekom/scale/issues/2116)) ([4c00769](https://github.com/telekom/scale/commit/4c00769ba49448a1ac2b8d8cb0d5874585b9ad24))
* set aria-current to false when changed ([#2015](https://github.com/telekom/scale/issues/2015)) ([51c9019](https://github.com/telekom/scale/commit/51c9019b2a5bd0dfd96905ee804a1af321547dac))
* set aria-label on nested button instead of scale-button ([#2115](https://github.com/telekom/scale/issues/2115)) ([fa502cf](https://github.com/telekom/scale/commit/fa502cfcc17fca54d87899901629c4eb29920493))
* tk-network ([#2117](https://github.com/telekom/scale/issues/2117)) ([3747093](https://github.com/telekom/scale/commit/374709357745cfa7d1618e445a0b175581ff3ddd))





# [3.0.0-beta.138](https://github.com/telekom/scale/compare/v3.0.0-beta.137...v3.0.0-beta.138) (2023-08-29)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
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.138",
"version": "3.0.0-beta.139",
"command": {
"version": {
"allowBranch": "main"
Expand Down
8 changes: 8 additions & 0 deletions packages/components-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
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.139](https://github.com/telekom/scale/compare/v3.0.0-beta.138...v3.0.0-beta.139) (2023-09-06)

**Note:** Version bump only for package @telekom/scale-components-angular





# [3.0.0-beta.138](https://github.com/telekom/scale/compare/v3.0.0-beta.137...v3.0.0-beta.138) (2023-08-29)

**Note:** Version bump only for package @telekom/scale-components-angular
Expand Down
2 changes: 1 addition & 1 deletion packages/components-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@telekom/scale-components-angular",
"version": "3.0.0-beta.138",
"version": "3.0.0-beta.139",
"description": "Angular specific wrapper for @telekom/scale-components",
"license": "MPL-2.0",
"homepage": "https://github.com/telekom/scale",
Expand Down
8 changes: 8 additions & 0 deletions packages/components-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
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.139](https://github.com/telekom/scale/compare/v3.0.0-beta.138...v3.0.0-beta.139) (2023-09-06)

**Note:** Version bump only for package @telekom/scale-components-react





# [3.0.0-beta.138](https://github.com/telekom/scale/compare/v3.0.0-beta.137...v3.0.0-beta.138) (2023-08-29)

**Note:** Version bump only for package @telekom/scale-components-react
Expand Down
2 changes: 1 addition & 1 deletion packages/components-react/package.json
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.138",
"version": "3.0.0-beta.139",
"description": "React proxy for @telekom/scale-components",
"license": "MPL-2.0",
"homepage": "https://github.com/telekom/scale",
Expand Down
8 changes: 8 additions & 0 deletions packages/components-vue/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
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.139](https://github.com/telekom/scale/compare/v3.0.0-beta.138...v3.0.0-beta.139) (2023-09-06)

**Note:** Version bump only for package @telekom/scale-components-vue





# [3.0.0-beta.138](https://github.com/telekom/scale/compare/v3.0.0-beta.137...v3.0.0-beta.138) (2023-08-29)

**Note:** Version bump only for package @telekom/scale-components-vue
Expand Down
2 changes: 1 addition & 1 deletion packages/components-vue/package.json
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.138",
"version": "3.0.0-beta.139",
"description": "Vue specific wrapper for @telekom/scale-components",
"license": "MPL-2.0",
"homepage": "https://github.com/telekom/scale",
Expand Down
15 changes: 15 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
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.139](https://github.com/telekom/scale/compare/v3.0.0-beta.138...v3.0.0-beta.139) (2023-09-06)


### Bug Fixes

* ignore blur when inside a tab panel ([#2111](https://github.com/telekom/scale/issues/2111)) ([3de029b](https://github.com/telekom/scale/commit/3de029b92458e135b9eafa3a7ed7015503fe41a7))
* set aria live on body part ([#2116](https://github.com/telekom/scale/issues/2116)) ([4c00769](https://github.com/telekom/scale/commit/4c00769ba49448a1ac2b8d8cb0d5874585b9ad24))
* set aria-current to false when changed ([#2015](https://github.com/telekom/scale/issues/2015)) ([51c9019](https://github.com/telekom/scale/commit/51c9019b2a5bd0dfd96905ee804a1af321547dac))
* set aria-label on nested button instead of scale-button ([#2115](https://github.com/telekom/scale/issues/2115)) ([fa502cf](https://github.com/telekom/scale/commit/fa502cfcc17fca54d87899901629c4eb29920493))
* tk-network ([#2117](https://github.com/telekom/scale/issues/2117)) ([3747093](https://github.com/telekom/scale/commit/374709357745cfa7d1618e445a0b175581ff3ddd))





# [3.0.0-beta.138](https://github.com/telekom/scale/compare/v3.0.0-beta.137...v3.0.0-beta.138) (2023-08-29)


Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@telekom/scale-components",
"version": "3.0.0-beta.138",
"version": "3.0.0-beta.139",
"description": "Scale is the digital design system for Telekom products and experiences.",
"homepage": "https://github.com/telekom/scale",
"repository": {
Expand Down Expand Up @@ -72,7 +72,7 @@
"@floating-ui/dom": "^0.5.4",
"@stencil/core": "^2.17.0",
"@telekom/design-tokens": "1.0.0-beta.8",
"@telekom/scale-design-tokens": "^3.0.0-beta.138",
"@telekom/scale-design-tokens": "^3.0.0-beta.139",
"classnames": "^2.2.6",
"stencil-inline-svg": "^1.0.1"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const HTMLCell: Cell = {
variant="secondary"
size="small"
icon-only
aria-label={`Activate to ${
inner-aria-label={`Activate to ${
content.isExpanded ? 'collapse' : 'expand'
} content`}
onClick={() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ export class DropdownSelect {
}

connectedCallback() {
if (this.hostElement.closest('scale-tab-panel')) {
this.ignoreBlur = true;
}
statusNote({ source: this.hostElement, tag: 'beta' });
this.currentIndex =
readOptions(this.hostElement).findIndex(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,16 @@ export class Notification {
this.isOpen && 'open'
)}
role={this.role}
aria-live={this.role === undefined ? undefined : this.innerAriaLive}
>
<div part="icon" aria-hidden="true">
<slot name="icon">
<IconTag size={ICON_SIZE} selected={this.type === 'toast'} />
</slot>
</div>
<div part="body">
<div
part="body"
aria-live={this.role === undefined ? undefined : this.innerAriaLive}
>
<div
part="heading"
role="heading"
Expand Down
9 changes: 9 additions & 0 deletions packages/components/src/components/switch/switch.css
Original file line number Diff line number Diff line change
Expand Up @@ -301,3 +301,12 @@ scale-switch scale-icon-action-success {
[data-platform='android'] .switch--disabled .switch__thumb {
color: var(--telekom-color-ui-strong);
}

@media screen and (forced-colors: active), (-ms-high-contrast: active) {
.switch__toggle {
border: 1px solid;
}
scale-icon-action-checkmark {
visibility: hidden !important;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

## Properties

| Property | Attribute | Description | Type | Default |
| --------------- | ----------------- | ----------- | --------- | ----------- |
| `active` | `active` | | `boolean` | `false` |
| `hideOnDesktop` | `hide-on-desktop` | | `boolean` | `false` |
| `hideOnMobile` | `hide-on-mobile` | | `boolean` | `false` |
| `role` | `role` | | `string` | `'none'` |
| `variant` | `variant` | | `string` | `undefined` |
| Property | Attribute | Description | Type | Default |
| --------------- | ----------------- | ----------- | ----------------------------------------------------------------------------------- | ------------ |
| `active` | `active` | | `boolean` | `false` |
| `hideOnDesktop` | `hide-on-desktop` | | `boolean` | `false` |
| `hideOnMobile` | `hide-on-mobile` | | `boolean` | `false` |
| `role` | `role` | | `string` | `'none'` |
| `variant` | `variant` | | `"functions" \| "lang-switcher" \| "main-nav" \| "meta-nav" \| "meta-nav-external"` | `'main-nav'` |


## Dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@

.scale-telekom-nav-list[variant='lang-switcher']
> .scale-telekom-nav-item
> a:where([aria-current='true']) {
> :where(a, button):where([aria-current='true']) {
font-weight: var(--telekom-typography-font-weight-extra-bold);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ export class TelekomNavItem {
@Element() hostElement: HTMLStencilElement;

@Prop({ reflect: true }) active?: boolean = false;
@Prop({ reflect: true }) variant?: string;
@Prop({ reflect: true }) variant?:
| 'meta-nav-external'
| 'meta-nav'
| 'lang-switcher'
| 'main-nav'
| 'functions' = 'main-nav';
@Prop({ reflect: true }) role: string | null = 'none';
@Prop({ reflect: true }) hideOnMobile?: boolean = false;
@Prop({ reflect: true }) hideOnDesktop?: boolean = false;
Expand All @@ -48,11 +53,12 @@ export class TelekomNavItem {
if (this.linkElement == null) {
return;
}
if (this.variant === 'lang-switcher' && this.active) {
toggleAriaCurrent(this.linkElement, newValue, 'true');
}
if (this.variant === 'main-nav' && this.active) {
toggleAriaCurrent(this.linkElement, newValue, 'true');
if (this.variant === 'lang-switcher' || this.variant === 'main-nav') {
toggleAriaCurrent(
this.linkElement,
newValue,
this.active ? 'true' : 'false'
);
}
}

Expand Down
14 changes: 14 additions & 0 deletions packages/components/src/components/text-field/text-field.css
Original file line number Diff line number Diff line change
Expand Up @@ -297,3 +297,17 @@ input[type='month']::-webkit-calendar-picker-indicator {
position: absolute;
right: 12px;
}

input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
input:-webkit-autofill:active {
color-scheme: dark;
}

@media screen and (forced-colors: active), (-ms-high-contrast: active) {
.text-field--readonly input,
.text-field--readonly .text-field__control {
border: 1px solid;
}
}
4 changes: 3 additions & 1 deletion packages/components/src/components/text-field/text-field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,9 @@ export class TextField {
onFocus={this.handleFocus}
onBlur={this.handleBlur}
onKeyDown={this.handleKeyDown}
{...(!!this.placeholder ? { placeholder: this.placeholder } : {})}
{...(!!this.placeholder && !this.readonly
? { placeholder: this.placeholder }
: {})}
disabled={this.disabled}
readonly={this.readonly}
autocomplete={this.inputAutocomplete}
Expand Down
8 changes: 8 additions & 0 deletions packages/design-tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
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.139](https://github.com/telekom/scale/compare/v3.0.0-beta.138...v3.0.0-beta.139) (2023-09-06)

**Note:** Version bump only for package @telekom/scale-design-tokens





# [3.0.0-beta.138](https://github.com/telekom/scale/compare/v3.0.0-beta.137...v3.0.0-beta.138) (2023-08-29)

**Note:** Version bump only for package @telekom/scale-design-tokens
Expand Down
2 changes: 1 addition & 1 deletion packages/design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@telekom/scale-design-tokens",
"version": "3.0.0-beta.138",
"version": "3.0.0-beta.139",
"type": "module",
"description": "Design Tokens for the Scale Design System",
"homepage": "https://github.com/telekom/scale",
Expand Down
8 changes: 8 additions & 0 deletions packages/storybook-vue/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
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.139](https://github.com/telekom/scale/compare/v3.0.0-beta.138...v3.0.0-beta.139) (2023-09-06)

**Note:** Version bump only for package @telekom/scale-storybook-vue





# [3.0.0-beta.138](https://github.com/telekom/scale/compare/v3.0.0-beta.137...v3.0.0-beta.138) (2023-08-29)

**Note:** Version bump only for package @telekom/scale-storybook-vue
Expand Down
6 changes: 3 additions & 3 deletions packages/storybook-vue/package.json
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.138",
"version": "3.0.0-beta.139",
"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.138",
"@telekom/scale-components-vue": "^3.0.0-beta.138"
"@telekom/scale-components": "^3.0.0-beta.139",
"@telekom/scale-components-vue": "^3.0.0-beta.139"
},
"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
8 changes: 8 additions & 0 deletions packages/visual-tests/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
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.139](https://github.com/telekom/scale/compare/v3.0.0-beta.138...v3.0.0-beta.139) (2023-09-06)

**Note:** Version bump only for package @telekom/scale-visual-tests





# [3.0.0-beta.138](https://github.com/telekom/scale/compare/v3.0.0-beta.137...v3.0.0-beta.138) (2023-08-29)

**Note:** Version bump only for package @telekom/scale-visual-tests
Expand Down
2 changes: 1 addition & 1 deletion packages/visual-tests/package.json
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.138",
"version": "3.0.0-beta.139",
"main": "index.js",
"license": "MPL-2.0",
"scripts": {
Expand Down

0 comments on commit 8ce3a6e

Please sign in to comment.