Merge branch 'main' into release

telekom · Jul 10, 2024 · 3b0b3f1 · 3b0b3f1
2 parents 50dd096 + e6e0d83
commit 3b0b3f1
Show file tree

Hide file tree

Showing 18 changed files with 96 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,19 @@
 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.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
+
+
+### Bug Fixes
+
+* **data-grid:** allow empty date ([#2322](https://github.com/telekom/scale/issues/2322)) ([116b50e](https://github.com/telekom/scale/commit/116b50e7a8712722f76edb9727ae0d9996aa516f))
+* **data-grid:** re-apply sort on data change ([#2324](https://github.com/telekom/scale/issues/2324)) ([3558e4b](https://github.com/telekom/scale/commit/3558e4b3ffd0b39fa34e7674c94482b8f82707f9))
+* **dropdown-select:** remove type keyword in import ([#2310](https://github.com/telekom/scale/issues/2310)) ([7304444](https://github.com/telekom/scale/commit/7304444f9dfee131496db39b28d99d46538946bb))
+
+
+
+
+
 # [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
 
 

diff --git a/lerna.json b/lerna.json
@@ -7,7 +7,7 @@
     "--pure-lockfile"
   ],
   "useWorkspaces": true,
-  "version": "3.0.0-beta.151",
+  "version": "3.0.0-beta.152",
   "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.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
+
+**Note:** Version bump only for package @telekom/scale-components-angular
+
+
+
+
+
 # [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
 
 **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.151",
+  "version": "3.0.0-beta.152",
   "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.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
+
+**Note:** Version bump only for package @telekom/scale-components-react
+
+
+
+
+
 # [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
 
 **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.151",
+  "version": "3.0.0-beta.152",
   "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.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
+
+**Note:** Version bump only for package @telekom/scale-components-vue
+
+
+
+
+
 # [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
 
 **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.151",
+  "version": "3.0.0-beta.152",
   "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,19 @@
 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.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
+
+
+### Bug Fixes
+
+* **data-grid:** allow empty date ([#2322](https://github.com/telekom/scale/issues/2322)) ([116b50e](https://github.com/telekom/scale/commit/116b50e7a8712722f76edb9727ae0d9996aa516f))
+* **data-grid:** re-apply sort on data change ([#2324](https://github.com/telekom/scale/issues/2324)) ([3558e4b](https://github.com/telekom/scale/commit/3558e4b3ffd0b39fa34e7674c94482b8f82707f9))
+* **dropdown-select:** remove type keyword in import ([#2310](https://github.com/telekom/scale/issues/2310)) ([7304444](https://github.com/telekom/scale/commit/7304444f9dfee131496db39b28d99d46538946bb))
+
+
+
+
+
 # [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
 
 

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.151",
+  "version": "3.0.0-beta.152",
   "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/data-grid/cell-handlers/date-cell.tsx b/packages/components/src/components/data-grid/cell-handlers/date-cell.tsx
@@ -24,7 +24,7 @@ export const DateCell: Cell = {
     sortBy: 'date',
   },
   render: ({ content, isAutoWidthCheck }) => {
-    let value = content;
+    let value = content ?? '';
 
     // Render all digits with 8s as they're the widest
     if (isAutoWidthCheck) {

diff --git a/packages/components/src/components/data-grid/data-grid.tsx b/packages/components/src/components/data-grid/data-grid.tsx
@@ -209,6 +209,8 @@ export class DataGrid {
     this.parseFields();
     this.checkForMobileTitle();
     this.checkForSortableFields();
+    // if the fields have changed then reset the sorting as the field may no longer be sortable
+    this.resetSortingToggle();
     this.dataNeedsCheck = true;
   }
   @Watch('rows')
@@ -220,7 +222,6 @@ export class DataGrid {
     }
     this.parseRows();
     this.setInitialRowProps();
-    this.resetSortingToggle();
     this.dataNeedsCheck = true;
     // Set flag to dirty to redo column width with new data
     this.needsAutoWidthParse = true;
@@ -235,6 +236,15 @@ export class DataGrid {
       // step back one page
       this.paginationStart = this.paginationStart - this.pageSize;
     }
+
+    // If the table was sorted and the data has changed then apply the existing sorting again
+    if (this.activeSortingIndex !== -1) {
+      this.sortTable(
+        this.fields[this.activeSortingIndex].sortDirection,
+        this.fields[this.activeSortingIndex].type,
+        this.activeSortingIndex
+      );
+    }
   }
 
   /* 8. Public Methods */

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.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
+
+**Note:** Version bump only for package @telekom/scale-design-tokens
+
+
+
+
+
 # [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
 
 **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.151",
+  "version": "3.0.0-beta.152",
   "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,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.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
+
+**Note:** Version bump only for package @telekom/scale-storybook-vue
+
+
+
+
+
 # [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
 
 

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.151",
+  "version": "3.0.0-beta.152",
   "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.151",
-    "@telekom/scale-components-vue": "^3.0.0-beta.151"
+    "@telekom/scale-components": "^3.0.0-beta.152",
+    "@telekom/scale-components-vue": "^3.0.0-beta.152"
   },
   "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
@@ -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.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
+
+**Note:** Version bump only for package @telekom/scale-visual-tests
+
+
+
+
+
 # [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
 
 **Note:** Version bump only for package @telekom/scale-visual-tests

diff --git 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.151",
+  "version": "3.0.0-beta.152",
   "main": "index.js",
   "license": "MPL-2.0",
   "scripts": {