Skip to content

Commit eb723a7

Browse files
committed
update to new correctly working beta package, improve code
1 parent 1b9df42 commit eb723a7

9 files changed

+5211
-6360
lines changed

package-lock.json

Lines changed: 5194 additions & 6309 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@angular/router": "^18.1.0",
2222
"@faker-js/faker": "^8.4.1",
2323
"@scania/tegel-angular-17": "^1.31.2",
24-
"@scania/tegel-styles": "1.0.0-ag-grid-design-review-beta.3",
24+
"@scania/tegel-styles": "1.0.0-ag-grid-v33-beta.1",
2525
"@tanstack/angular-table": "^8.19.2",
2626
"ag-grid-angular": "^33.3.1",
2727
"ag-grid-community": "^33.3.1",
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ag-grid-angular
2-
style="width: 100%; height: 100%;"
2+
style="width: 100%; height: 100%"
33
[rowData]="rowData"
44
[columnDefs]="columnDefs"
55
[defaultColDef]="defaultColDef"
6-
(gridReady)="onGridReady($event)">
7-
</ag-grid-angular>
6+
(gridReady)="onGridReady($event)"
7+
>
8+
</ag-grid-angular>

src/app/pages/ag-grid/ag-grid-column-search.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,16 @@ import {
88
GridReadyEvent,
99
AllCommunityModule,
1010
ModuleRegistry,
11-
provideGlobalGridOptions,
1211
} from "ag-grid-community";
1312
import { AgGridModule } from "ag-grid-angular";
1413

1514
ModuleRegistry.registerModules([AllCommunityModule]);
16-
provideGlobalGridOptions({
17-
theme: "legacy",
18-
});
1915

2016
@Component({
2117
selector: "app-ag-grid-column-search",
2218
standalone: true,
2319
encapsulation: ViewEncapsulation.None, // Disable Angular's style encapsulation
2420
templateUrl: "./ag-grid-column-search.component.html",
25-
styleUrls: ["ag-styles-loader.css"],
2621
imports: [TegelModule, AgGridModule, AgGridAngular],
2722
})
2823
export default class AgGridColumnSearchComponent {
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ag-grid-angular
2-
style="width: 100%; height: 100%;"
2+
style="width: 100%; height: 100%"
33
[rowData]="rowData"
44
[columnDefs]="columnDefs"
55
[defaultColDef]="defaultColDef"
6-
(gridReady)="onGridReady($event)">
7-
</ag-grid-angular>
6+
(gridReady)="onGridReady($event)"
7+
>
8+
</ag-grid-angular>

src/app/pages/ag-grid/ag-grid-editable-cells.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { AgGridModule } from "ag-grid-angular";
1010
standalone: true,
1111
encapsulation: ViewEncapsulation.None, // Disable Angular's style encapsulation
1212
templateUrl: "./ag-grid-editable-cells.component.html",
13-
styleUrls: ["ag-styles-loader.css"],
1413
imports: [TegelModule, AgGridModule, AgGridAngular],
1514
})
1615
export default class AgGridEditableCellsComponent {

src/app/pages/ag-grid/ag-grid-page.component.ts

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,23 @@ import { TegelModule } from "@scania/tegel-angular-17";
77
@Component({
88
selector: "app-table-page",
99
template: `
10-
<div class="tds-u-pb3">
11-
<tds-toggle
12-
(tdsToggle)="toggleMode()"
13-
headline="Toggle compact mode (currently not working)"
14-
size="sm"
15-
>
16-
<div slot="label">{{ labelText }}</div>
17-
</tds-toggle>
18-
</div>
19-
2010
<div
21-
class="ag-theme-quartz tds-mode-variant-primary"
22-
[class.compact]="classCompact"
23-
style="height: 500px; width: 100%;"
11+
class="tds-mode-variant-primary"
12+
style="height: 500px; width: 100%; padding: 20px; padding-bottom: 100px"
2413
>
2514
<h4>Primary mode variant</h4>
2615
<app-ag-grid-column-search></app-ag-grid-column-search>
2716
</div>
2817
2918
<div
30-
class="ag-theme-quartz tds-mode-variant-secondary"
31-
[class.compact]="classCompact"
32-
style="height: 500px; width: 100%;"
19+
class="tds-mode-variant-secondary"
20+
style="height: 500px; width: 100%; padding: 20px; padding-bottom: 100px; margin-top: 10px; margin-bottom: 10px"
3321
>
34-
<h4 style="margin-top: 100px">Secondary mode variant</h4>
22+
<h4 style="margin-top: 10px">Secondary mode variant</h4>
3523
<app-ag-grid-editable-cells></app-ag-grid-editable-cells>
3624
</div>
37-
38-
<div style="margin-top: 100px"></div>
3925
`,
40-
styles: [``],
4126
standalone: true,
4227
imports: [AgGridColumnSearch, AgGridEditableCells, AsyncPipe, TegelModule],
4328
})
44-
export default class AgGridPageComponent {
45-
classCompact = false;
46-
labelText: "Compact" | "Default" = "Default";
47-
48-
public toggleMode() {
49-
this.classCompact = !this.classCompact;
50-
if (this.labelText === "Compact") {
51-
this.labelText = "Default";
52-
} else {
53-
this.labelText = "Compact";
54-
}
55-
}
56-
}
29+
export default class AgGridPageComponent {}

src/app/pages/ag-grid/ag-styles-loader.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/styles.css

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
@import "reset.css";
22
@import url("@scania/tegel/dist/tegel/tegel.css");
33

4-
/* Core Data Grid CSS */
5-
@import url("ag-grid-community/styles/ag-grid.css");
6-
/* Quartz Theme Specific CSS */
7-
@import url("ag-grid-community/styles/ag-theme-quartz.css");
4+
/* AG Grid Tegel styling */
5+
@import url("@scania/tegel-styles/dist/customization/ag-grid/theme.css");
86

97
.tds-mode-dark {
108
color: var(--tds-grey-100);

0 commit comments

Comments
 (0)