Merge branch 'main' into release

telekom · Feb 15, 2024 · 9cde0c8 · 9cde0c8
2 parents b8c8a22 + dc29a3e
commit 9cde0c8
Show file tree

Hide file tree

Showing 25 changed files with 165 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,27 @@
 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.148](https://github.com/telekom/scale/compare/v3.0.0-beta.147...v3.0.0-beta.148) (2024-02-15)
+
+
+### Bug Fixes
+
+* **data-grid:** heading height with hidden menu ([#2270](https://github.com/telekom/scale/issues/2270)) ([736a301](https://github.com/telekom/scale/commit/736a3013214540c8fe4cb7a7b62e30015fcf4e57))
+* **dropdown-select:** disable keyboard navigation when disabled ([#2271](https://github.com/telekom/scale/issues/2271)) ([cc1bf66](https://github.com/telekom/scale/commit/cc1bf66ebc006ca1b07333b06be1a0c238456f0e))
+* **dropdown-select:** escape name of hidden input in dropdown-select to support square brackets ([#2267](https://github.com/telekom/scale/issues/2267)) ([97b1297](https://github.com/telekom/scale/commit/97b129704d36733a650cad99229b475a3f92937c))
+* **dropdown-select:** remove querySelector, store the hidden input in a variable instead ([#2279](https://github.com/telekom/scale/issues/2279)) ([6ed6c2a](https://github.com/telekom/scale/commit/6ed6c2a86aade135cbc1d9fe7ccd80ab95f824cc))
+* **table:** prevent jumping headers when sorting ([#2265](https://github.com/telekom/scale/issues/2265)) ([94f0cd4](https://github.com/telekom/scale/commit/94f0cd4a197872d19c1e4334fe797c262c57de0e))
+* **telekom-header:** listen for mouseleave on mega menu to close mega when moving cursor beyond mega menu ([#2280](https://github.com/telekom/scale/issues/2280)) ([ae5812a](https://github.com/telekom/scale/commit/ae5812afd64c471bd95d2292e3c4364ec29b4541))
+
+
+### Features
+
+* **telekom-profile-menu:** WIP ([#2208](https://github.com/telekom/scale/issues/2208)) ([41374f0](https://github.com/telekom/scale/commit/41374f0b8bb847507e0fd8565d01ad314d467fb6))
+
+
+
+
+
 # [3.0.0-beta.147](https://github.com/telekom/scale/compare/v3.0.0-beta.146...v3.0.0-beta.147) (2024-01-15)
 
 

diff --git a/lerna.json b/lerna.json
@@ -7,7 +7,7 @@
     "--pure-lockfile"
   ],
   "useWorkspaces": true,
-  "version": "3.0.0-beta.147",
+  "version": "3.0.0-beta.148",
   "command": {
     "version": {
       "allowBranch": "main"

diff --git a/packages/components-angular/CHANGELOG.md b/packages/components-angular/CHANGELOG.md
@@ -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.148](https://github.com/telekom/scale/compare/v3.0.0-beta.147...v3.0.0-beta.148) (2024-02-15)
+
+**Note:** Version bump only for package @telekom/scale-components-angular
+
+
+
+
+
 # [3.0.0-beta.147](https://github.com/telekom/scale/compare/v3.0.0-beta.146...v3.0.0-beta.147) (2024-01-15)
 
 **Note:** Version bump only for package @telekom/scale-components-angular

diff --git 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.147",
+  "version": "3.0.0-beta.148",
   "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
@@ -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.148](https://github.com/telekom/scale/compare/v3.0.0-beta.147...v3.0.0-beta.148) (2024-02-15)
+
+**Note:** Version bump only for package @telekom/scale-components-react
+
+
+
+
+
 # [3.0.0-beta.147](https://github.com/telekom/scale/compare/v3.0.0-beta.146...v3.0.0-beta.147) (2024-01-15)
 
 **Note:** Version bump only for package @telekom/scale-components-react

diff --git 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.147",
+  "version": "3.0.0-beta.148",
   "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
@@ -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.148](https://github.com/telekom/scale/compare/v3.0.0-beta.147...v3.0.0-beta.148) (2024-02-15)
+
+**Note:** Version bump only for package @telekom/scale-components-vue
+
+
+
+
+
 # [3.0.0-beta.147](https://github.com/telekom/scale/compare/v3.0.0-beta.146...v3.0.0-beta.147) (2024-01-15)
 
 **Note:** Version bump only for package @telekom/scale-components-vue

diff --git 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.147",
+  "version": "3.0.0-beta.148",
   "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
@@ -3,6 +3,27 @@
 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.148](https://github.com/telekom/scale/compare/v3.0.0-beta.147...v3.0.0-beta.148) (2024-02-15)
+
+
+### Bug Fixes
+
+* **data-grid:** heading height with hidden menu ([#2270](https://github.com/telekom/scale/issues/2270)) ([736a301](https://github.com/telekom/scale/commit/736a3013214540c8fe4cb7a7b62e30015fcf4e57))
+* **dropdown-select:** disable keyboard navigation when disabled ([#2271](https://github.com/telekom/scale/issues/2271)) ([cc1bf66](https://github.com/telekom/scale/commit/cc1bf66ebc006ca1b07333b06be1a0c238456f0e))
+* **dropdown-select:** escape name of hidden input in dropdown-select to support square brackets ([#2267](https://github.com/telekom/scale/issues/2267)) ([97b1297](https://github.com/telekom/scale/commit/97b129704d36733a650cad99229b475a3f92937c))
+* **dropdown-select:** remove querySelector, store the hidden input in a variable instead ([#2279](https://github.com/telekom/scale/issues/2279)) ([6ed6c2a](https://github.com/telekom/scale/commit/6ed6c2a86aade135cbc1d9fe7ccd80ab95f824cc))
+* **table:** prevent jumping headers when sorting ([#2265](https://github.com/telekom/scale/issues/2265)) ([94f0cd4](https://github.com/telekom/scale/commit/94f0cd4a197872d19c1e4334fe797c262c57de0e))
+* **telekom-header:** listen for mouseleave on mega menu to close mega when moving cursor beyond mega menu ([#2280](https://github.com/telekom/scale/issues/2280)) ([ae5812a](https://github.com/telekom/scale/commit/ae5812afd64c471bd95d2292e3c4364ec29b4541))
+
+
+### Features
+
+* **telekom-profile-menu:** WIP ([#2208](https://github.com/telekom/scale/issues/2208)) ([41374f0](https://github.com/telekom/scale/commit/41374f0b8bb847507e0fd8565d01ad314d467fb6))
+
+
+
+
+
 # [3.0.0-beta.147](https://github.com/telekom/scale/compare/v3.0.0-beta.146...v3.0.0-beta.147) (2024-01-15)
 
 

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@telekom/scale-components",
-  "version": "3.0.0-beta.147",
+  "version": "3.0.0-beta.148",
   "description": "Scale is the digital design system for Telekom products and experiences.",
   "homepage": "https://github.com/telekom/scale",
   "repository": {
@@ -73,7 +73,7 @@
     "@floating-ui/dom": "^1.2.8",
     "@stencil/core": "^2.17.0",
     "@telekom/design-tokens": "1.0.0-beta.10",
-    "@telekom/scale-design-tokens": "^3.0.0-beta.147",
+    "@telekom/scale-design-tokens": "^3.0.0-beta.148",
     "classnames": "^2.2.6",
     "composed-offset-position": "^0.0.4",
     "stencil-inline-svg": "^1.0.1"

diff --git a/packages/components/src/components/data-grid/data-grid.css b/packages/components/src/components/data-grid/data-grid.css
@@ -127,8 +127,9 @@
   display: none;
 }
 
-.data-grid:not(.data-grid--hide-menu) .data-grid__title-block {
-  min-height: 72px;
+.data-grid:not(.data-grid--hide-menu.data-grid--no-heading)
+  .data-grid__title-block {
+  min-height: var(--telekom-spacing-composition-space-18, 72px);
 }
 .data-grid--hide-menu .data-grid__title-block {
   padding-right: var(--telekom-spacing-composition-space-06);

diff --git a/packages/components/src/components/data-grid/data-grid.tsx b/packages/components/src/components/data-grid/data-grid.tsx
@@ -334,7 +334,8 @@ export class DataGrid {
       this.shadeAlternate && `${name}--shade-alternate`,
       this.freezeHeader && `${name}--freeze-header`,
       this.hideBorder && `${name}--hide-border`,
-      this.hideMenu && `${name}--hide-menu`
+      this.hideMenu && `${name}--hide-menu`,
+      !this.heading && `${name}--no-heading`
     );
   }
 

diff --git a/packages/components/src/components/dropdown-select/dropdown-select.tsx b/packages/components/src/components/dropdown-select/dropdown-select.tsx
@@ -270,6 +270,7 @@ export class DropdownSelect {
   private comboEl: HTMLElement;
   private listboxEl: HTMLElement;
   private listboxPadEl: HTMLElement;
+  private hiddenInput: HTMLInputElement;
 
   @Watch('value')
   valueChange(newValue) {
@@ -320,12 +321,11 @@ export class DropdownSelect {
     input.value = this.value;
     input.type = 'hidden';
     this.hostElement.appendChild(input);
+    this.hiddenInput = input;
   }
 
   updateInputHidden(value: string = this.value): void {
-    this.hostElement.querySelector<HTMLInputElement>(
-      `input[name=${this.name}]`
-    ).value = value;
+    this.hiddenInput.value = value;
   }
 
   selectOption = (index) => {
@@ -498,7 +498,7 @@ export class DropdownSelect {
               id={this.comboboxId}
               part="combobox"
               role="combobox"
-              tabindex="0"
+              tabindex={this.disabled ? '-1' : '0'}
               onBlur={this.handleBlur}
               onFocus={this.handleFocus}
               onClick={this.handleClick}

diff --git a/packages/components/src/components/table/table.css b/packages/components/src/components/table/table.css
@@ -28,7 +28,7 @@ scale-table {
   --border-bottom-tfoot-td: var(--telekom-spacing-composition-space-01) solid
     var(--telekom-color-ui-extra-strong);
 
-  --spacing-th-sortable: 0 var(--telekom-spacing-composition-space-04) 0 0;
+  --spacing-th-sortable: 0 0 0 0;
   --background-th-sortable-hover: var(--telekom-color-ui-subtle);
   --background-th-sortable-active: var(--telekom-color-ui-faint);
   --box-shadow-th-sortable-focus: inset 0 0 0
@@ -100,6 +100,7 @@ scale-table {
 .table--sortable th {
   cursor: pointer;
   padding: var(--spacing-th-sortable);
+  padding-right: 0;
 }
 .table--sortable th:hover {
   padding: var(--spacing-th-sortable);
@@ -121,9 +122,11 @@ scale-table {
 }
 .table--sortable th:not([aria-sort]) {
   padding: var(--padding);
+  padding-right: var(--telekom-spacing-composition-space-07);
 }
 .table--sortable th[aria-sort='none'] {
   padding: var(--padding);
+  padding-right: var(--telekom-spacing-composition-space-05);
 }
 .table--sortable th[aria-sort='ascending'] .scale-sort-indicator .up {
   color: var(--color);
@@ -188,7 +191,7 @@ scale-table {
   color: transparent;
 }
 .table--sortable th[aria-sort='none']:hover {
-  padding: 0 8px 0 0;
+  padding: 0 0 0 0;
 }
 .table--sortable th[aria-sort='none'] .scale-sort-indicator {
   display: none;

diff --git a/packages/components/src/components/table/table.spec.ts b/packages/components/src/components/table/table.spec.ts
@@ -27,9 +27,27 @@ describe('Table', () => {
         <table>
           <thead>
             <tr>
-              <th>Title</th>
-              <th>Time</th>
-              <th>Euros</th>
+              <th>
+                <span aria-hidden="true" class="scale-sort-indicator">
+                  <scale-icon-content-sort-indicator-up class="scale-sort-indicator-icon up" size="16"></scale-icon-content-sort-indicator-up>
+                  <scale-icon-content-sort-indicator-down class="down scale-sort-indicator-icon" size="16"></scale-icon-content-sort-indicator-down>
+                </span>              
+                Title
+              </th>
+              <th>
+                <span aria-hidden="true" class="scale-sort-indicator">
+                  <scale-icon-content-sort-indicator-up class="scale-sort-indicator-icon up" size="16"></scale-icon-content-sort-indicator-up>
+                  <scale-icon-content-sort-indicator-down class="down scale-sort-indicator-icon" size="16"></scale-icon-content-sort-indicator-down>
+                </span>                    
+                Time
+              </th>
+              <th>
+                <span aria-hidden="true" class="scale-sort-indicator">
+                  <scale-icon-content-sort-indicator-up class="scale-sort-indicator-icon up" size="16"></scale-icon-content-sort-indicator-up>
+                  <scale-icon-content-sort-indicator-down class="down scale-sort-indicator-icon" size="16"></scale-icon-content-sort-indicator-down>
+                </span>                 
+                Euros
+              </th>
             </tr>
           </thead>
           <tbody>

diff --git a/packages/components/src/components/table/table.tsx b/packages/components/src/components/table/table.tsx
@@ -47,9 +47,11 @@ export class Table {
   }
 
   componentWillLoad() {
-    this.hostElement.querySelectorAll('th').forEach((th) => {
-      this.addSortIndicator(th);
-    });
+    if (this.showSort) {
+      this.hostElement.querySelectorAll('th').forEach((th) => {
+        this.addSortIndicator(th);
+      });
+    }
   }
 
   componentWillUpdate() {
@@ -58,7 +60,9 @@ export class Table {
       if (th.children.length === 0) {
         // this may not be needed
         th.classList.add('dynamically-added');
-        this.addSortIndicator(th);
+        if (this.showSort) {
+          this.addSortIndicator(th);
+        }
       }
     });
   }

diff --git a/packages/components/src/components/telekom/telekom-nav-flyout/telekom-nav-flyout.tsx b/packages/components/src/components/telekom/telekom-nav-flyout/telekom-nav-flyout.tsx
@@ -147,12 +147,25 @@ export class TelekomNavItem {
       return;
     }
     this.expanded = true;
-    this.parentElement.addEventListener('mouseleave', this.handlePointerOut);
+    this.hostElement.parentElement.addEventListener(
+      'mouseleave',
+      this.handlePointerOut
+    );
+    if (this.hostElement.querySelector('scale-telekom-mega-menu') !== null) {
+      this.hostElement
+        .querySelector('scale-telekom-mega-menu')
+        .addEventListener('mouseleave', this.handlePointerOut);
+    }
   };
 
   handlePointerOut = () => {
     this.expanded = false;
-    this.parentElement.removeEventListener('mouseleave', this.handlePointerOut);
+    this.hostElement.removeEventListener('mouseleave', this.handlePointerOut);
+    if (this.hostElement.querySelector('scale-telekom-mega-menu') !== null) {
+      this.hostElement
+        .querySelector('scale-telekom-mega-menu')
+        .addEventListener('mouseleave', this.handlePointerOut);
+    }
   };
 
   @Method()

diff --git a/packages/design-tokens/CHANGELOG.md b/packages/design-tokens/CHANGELOG.md
@@ -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.148](https://github.com/telekom/scale/compare/v3.0.0-beta.147...v3.0.0-beta.148) (2024-02-15)
+
+**Note:** Version bump only for package @telekom/scale-design-tokens
+
+
+
+
+
 # [3.0.0-beta.147](https://github.com/telekom/scale/compare/v3.0.0-beta.146...v3.0.0-beta.147) (2024-01-15)
 
 **Note:** Version bump only for package @telekom/scale-design-tokens

diff --git 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.147",
+  "version": "3.0.0-beta.148",
   "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
@@ -3,6 +3,17 @@
 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.148](https://github.com/telekom/scale/compare/v3.0.0-beta.147...v3.0.0-beta.148) (2024-02-15)
+
+
+### Features
+
+* **telekom-profile-menu:** WIP ([#2208](https://github.com/telekom/scale/issues/2208)) ([41374f0](https://github.com/telekom/scale/commit/41374f0b8bb847507e0fd8565d01ad314d467fb6))
+
+
+
+
+
 # [3.0.0-beta.147](https://github.com/telekom/scale/compare/v3.0.0-beta.146...v3.0.0-beta.147) (2024-01-15)
 
 

diff --git 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.147",
+  "version": "3.0.0-beta.148",
   "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.147",
-    "@telekom/scale-components-vue": "^3.0.0-beta.147"
+    "@telekom/scale-components": "^3.0.0-beta.148",
+    "@telekom/scale-components-vue": "^3.0.0-beta.148"
   },
   "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/",