Skip to content

Commit 3b0b3f1

Browse files
author
Arturo
committed
Merge branch 'main' into release
2 parents 50dd096 + e6e0d83 commit 3b0b3f1

File tree

18 files changed

+96
-12
lines changed

18 files changed

+96
-12
lines changed

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.0.0-beta.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
7+
8+
9+
### Bug Fixes
10+
11+
* **data-grid:** allow empty date ([#2322](https://github.com/telekom/scale/issues/2322)) ([116b50e](https://github.com/telekom/scale/commit/116b50e7a8712722f76edb9727ae0d9996aa516f))
12+
* **data-grid:** re-apply sort on data change ([#2324](https://github.com/telekom/scale/issues/2324)) ([3558e4b](https://github.com/telekom/scale/commit/3558e4b3ffd0b39fa34e7674c94482b8f82707f9))
13+
* **dropdown-select:** remove type keyword in import ([#2310](https://github.com/telekom/scale/issues/2310)) ([7304444](https://github.com/telekom/scale/commit/7304444f9dfee131496db39b28d99d46538946bb))
14+
15+
16+
17+
18+
619
# [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
720

821

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"--pure-lockfile"
88
],
99
"useWorkspaces": true,
10-
"version": "3.0.0-beta.151",
10+
"version": "3.0.0-beta.152",
1111
"command": {
1212
"version": {
1313
"allowBranch": "main"

‎packages/components-angular/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.0.0-beta.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
7+
8+
**Note:** Version bump only for package @telekom/scale-components-angular
9+
10+
11+
12+
13+
614
# [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
715

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

‎packages/components-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@telekom/scale-components-angular",
3-
"version": "3.0.0-beta.151",
3+
"version": "3.0.0-beta.152",
44
"description": "Angular specific wrapper for @telekom/scale-components",
55
"license": "MPL-2.0",
66
"homepage": "https://github.com/telekom/scale",

‎packages/components-react/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.0.0-beta.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
7+
8+
**Note:** Version bump only for package @telekom/scale-components-react
9+
10+
11+
12+
13+
614
# [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
715

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

‎packages/components-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@telekom/scale-components-react",
33
"sideEffects": false,
4-
"version": "3.0.0-beta.151",
4+
"version": "3.0.0-beta.152",
55
"description": "React proxy for @telekom/scale-components",
66
"license": "MPL-2.0",
77
"homepage": "https://github.com/telekom/scale",

‎packages/components-vue/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.0.0-beta.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
7+
8+
**Note:** Version bump only for package @telekom/scale-components-vue
9+
10+
11+
12+
13+
614
# [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
715

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

‎packages/components-vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@telekom/scale-components-vue",
33
"sideEffects": false,
4-
"version": "3.0.0-beta.151",
4+
"version": "3.0.0-beta.152",
55
"description": "Vue specific wrapper for @telekom/scale-components",
66
"license": "MPL-2.0",
77
"homepage": "https://github.com/telekom/scale",

‎packages/components/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.0.0-beta.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
7+
8+
9+
### Bug Fixes
10+
11+
* **data-grid:** allow empty date ([#2322](https://github.com/telekom/scale/issues/2322)) ([116b50e](https://github.com/telekom/scale/commit/116b50e7a8712722f76edb9727ae0d9996aa516f))
12+
* **data-grid:** re-apply sort on data change ([#2324](https://github.com/telekom/scale/issues/2324)) ([3558e4b](https://github.com/telekom/scale/commit/3558e4b3ffd0b39fa34e7674c94482b8f82707f9))
13+
* **dropdown-select:** remove type keyword in import ([#2310](https://github.com/telekom/scale/issues/2310)) ([7304444](https://github.com/telekom/scale/commit/7304444f9dfee131496db39b28d99d46538946bb))
14+
15+
16+
17+
18+
619
# [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
720

821

‎packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@telekom/scale-components",
3-
"version": "3.0.0-beta.151",
3+
"version": "3.0.0-beta.152",
44
"description": "Scale is the digital design system for Telekom products and experiences.",
55
"homepage": "https://github.com/telekom/scale",
66
"repository": {

‎packages/components/src/components/data-grid/cell-handlers/date-cell.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const DateCell: Cell = {
2424
sortBy: 'date',
2525
},
2626
render: ({ content, isAutoWidthCheck }) => {
27-
let value = content;
27+
let value = content ?? '';
2828

2929
// Render all digits with 8s as they're the widest
3030
if (isAutoWidthCheck) {

‎packages/components/src/components/data-grid/data-grid.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ export class DataGrid {
209209
this.parseFields();
210210
this.checkForMobileTitle();
211211
this.checkForSortableFields();
212+
// if the fields have changed then reset the sorting as the field may no longer be sortable
213+
this.resetSortingToggle();
212214
this.dataNeedsCheck = true;
213215
}
214216
@Watch('rows')
@@ -220,7 +222,6 @@ export class DataGrid {
220222
}
221223
this.parseRows();
222224
this.setInitialRowProps();
223-
this.resetSortingToggle();
224225
this.dataNeedsCheck = true;
225226
// Set flag to dirty to redo column width with new data
226227
this.needsAutoWidthParse = true;
@@ -235,6 +236,15 @@ export class DataGrid {
235236
// step back one page
236237
this.paginationStart = this.paginationStart - this.pageSize;
237238
}
239+
240+
// If the table was sorted and the data has changed then apply the existing sorting again
241+
if (this.activeSortingIndex !== -1) {
242+
this.sortTable(
243+
this.fields[this.activeSortingIndex].sortDirection,
244+
this.fields[this.activeSortingIndex].type,
245+
this.activeSortingIndex
246+
);
247+
}
238248
}
239249

240250
/* 8. Public Methods */

‎packages/design-tokens/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.0.0-beta.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
7+
8+
**Note:** Version bump only for package @telekom/scale-design-tokens
9+
10+
11+
12+
13+
614
# [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
715

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

‎packages/design-tokens/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@telekom/scale-design-tokens",
3-
"version": "3.0.0-beta.151",
3+
"version": "3.0.0-beta.152",
44
"type": "module",
55
"description": "Design Tokens for the Scale Design System",
66
"homepage": "https://github.com/telekom/scale",

‎packages/storybook-vue/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.0.0-beta.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
7+
8+
**Note:** Version bump only for package @telekom/scale-storybook-vue
9+
10+
11+
12+
13+
614
# [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
715

816

‎packages/storybook-vue/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"homepage": "https://telekom.github.io/scale",
33
"name": "@telekom/scale-storybook-vue",
44
"private": true,
5-
"version": "3.0.0-beta.151",
5+
"version": "3.0.0-beta.152",
66
"main": "index.js",
77
"license": "MPL-2.0",
88
"devDependencies": {
@@ -32,8 +32,8 @@
3232
"dependencies": {
3333
"@storybook/addon-viewport": "^6.4.22",
3434
"@telekom/design-tokens": "^1.0.0-beta.2",
35-
"@telekom/scale-components": "^3.0.0-beta.151",
36-
"@telekom/scale-components-vue": "^3.0.0-beta.151"
35+
"@telekom/scale-components": "^3.0.0-beta.152",
36+
"@telekom/scale-components-vue": "^3.0.0-beta.152"
3737
},
3838
"scripts": {
3939
"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/",

‎packages/visual-tests/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.0.0-beta.152](https://github.com/telekom/scale/compare/v3.0.0-beta.151...v3.0.0-beta.152) (2024-07-10)
7+
8+
**Note:** Version bump only for package @telekom/scale-visual-tests
9+
10+
11+
12+
13+
614
# [3.0.0-beta.151](https://github.com/telekom/scale/compare/v3.0.0-beta.150...v3.0.0-beta.151) (2024-04-12)
715

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

‎packages/visual-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@telekom/scale-visual-tests",
33
"private": true,
4-
"version": "3.0.0-beta.151",
4+
"version": "3.0.0-beta.152",
55
"main": "index.js",
66
"license": "MPL-2.0",
77
"scripts": {

0 commit comments

Comments
 (0)