Skip to content

Commit 4681e0a

Browse files
authored
Merge pull request #1545 from ghiscoding/chore/jsdom26
chore: upgrade JSDOM & other testing tools to latest
2 parents e8aaff2 + 48537d9 commit 4681e0a

6 files changed

+322
-389
lines changed

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@
9393
"@formkit/tempo": "^0.1.2",
9494
"@ng-select/ng-select": "^13.9.1",
9595
"@ngx-translate/http-loader": "^8.0.0",
96-
"@nx/angular": "^20.6.1",
97-
"@nx/devkit": "^20.6.1",
98-
"@nx/vite": "^20.6.1",
96+
"@nx/angular": "^20.6.2",
97+
"@nx/devkit": "^20.6.2",
98+
"@nx/vite": "^20.6.2",
9999
"@popperjs/core": "^2.11.8",
100100
"@release-it/conventional-changelog": "^10.0.0",
101101
"@slickgrid-universal/composite-editor-component": "~5.13.1",
@@ -117,7 +117,7 @@
117117
"eslint": "^9.22.0",
118118
"eslint-plugin-cypress": "^4.2.0",
119119
"eslint-plugin-n": "^17.16.2",
120-
"jsdom": "^22.1.0",
120+
"jsdom": "^26.0.0",
121121
"native-copyfiles": "^0.3.2",
122122
"ng-packagr": "^18.2.1",
123123
"ngx-bootstrap": "^18.1.3",
@@ -135,7 +135,7 @@
135135
"typescript": "~5.5.4",
136136
"typescript-eslint": "^8.26.1",
137137
"vite": "^6.2.2",
138-
"vite-tsconfig-paths": "^4.3.2",
138+
"vite-tsconfig-paths": "^5.1.4",
139139
"vitest": "^3.0.9",
140140
"zone.js": "~0.15.0"
141141
},

src/app/app.component.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ $side-menu-width: 250px;
1111
color: red;
1212
}
1313
.faded {
14-
opacity: 0.7;
14+
opacity: 0.7;
1515
}
1616
.faded:hover {
17-
opacity: 1;
17+
opacity: 1;
1818
}
1919

2020
section {
@@ -24,7 +24,7 @@ section {
2424
/** Sidebar (left) and Content (right) */
2525
@media (min-width: 1200px) {
2626
.panel-wm-content .container {
27-
width: calc(1170px - #{$side-menu-width});
27+
width: calc(1170px - #{$side-menu-width});
2828
}
2929
}
3030

src/app/examples/grid-graphql-nopage.component.html

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ <h2>
3434
</div>
3535
</div>
3636

37-
<angular-slickgrid gridId="grid27" [columnDefinitions]="columnDefinitions" [gridOptions]="gridOptions" [dataset]="dataset">
37+
<angular-slickgrid
38+
gridId="grid27"
39+
[columnDefinitions]="columnDefinitions"
40+
[gridOptions]="gridOptions"
41+
[dataset]="dataset"
42+
(onAngularGridCreated)="angularGridReady($event.detail)"
43+
>
3844
</angular-slickgrid>
3945
</div>

src/app/examples/grid-graphql-nopage.component.ts

+4
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ export class GridGraphqlWithoutPaginationComponent implements OnInit {
6464

6565
constructor(private http: HttpClient) {}
6666

67+
angularGridReady(angularGrid: AngularGridInstance) {
68+
this.angularGrid = angularGrid;
69+
}
70+
6771
ngOnInit(): void {
6872
this.columnDefinitions = [
6973
{ id: 'countryCode', field: 'code', name: 'Code', maxWidth: 90, sortable: true, filterable: true, columnGroup: 'Country' },

src/styles.scss

+43-95
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
@use 'sass:color';
22

3-
$navbar-height: 56px;
4-
$side-menu-width: 250px;
5-
$button-border-color: #ababab;
6-
$button-style-bg-color: #fff;
7-
$primary-color: #0e6cfa;
3+
$primary-color: #0d6efd;
84

95
@use 'bootstrap/scss/bootstrap' with (
106
$primary: $primary-color
@@ -27,32 +23,17 @@ $primary-color: #0e6cfa;
2723
// --slick-button-border-color: #c7c7c7;
2824
}
2925

30-
.bold {
31-
font-weight: bold;
32-
}
26+
$button-border-color: #ababab;
27+
$button-style-bg-color: #fff;
3328

3429
.italic {
3530
font-style: italic;
3631
}
3732

38-
.font18 {
39-
font-size: 18px;
40-
}
41-
4233
.hidden {
4334
display: none;
4435
}
4536

46-
.btn-icon {
47-
display: inline-flex;
48-
align-items: center;
49-
gap: 4px;
50-
}
51-
52-
.gap-4px {
53-
gap: 4px;
54-
}
55-
5637
.btn-group-xs > .btn,
5738
.btn-xs {
5839
padding: 1px 5px;
@@ -65,99 +46,62 @@ $primary-color: #0e6cfa;
6546
vertical-align: middle;
6647
}
6748

68-
.mdi-pencil.pointer:hover {
69-
color: #00bfff;
70-
}
71-
.mdi-trash-can.pointer:hover {
72-
color: #ff002b;
49+
.btn-icon {
50+
display: inline-flex;
51+
align-items: center;
52+
gap: 4px;
7353
}
7454

75-
.body-content {
76-
margin-top: $navbar-height;
55+
.gap-4px {
56+
gap: 4px;
7757
}
7858

79-
.lightblue {
80-
color: lightblue;
81-
}
59+
.side-menu {
60+
margin-left: 15px;
8261

83-
.red {
84-
color: red;
62+
.links {
63+
background-color: #f9f9f9;
64+
border-right: 1px solid #d0d0d0;
65+
overflow-y: auto;
66+
padding: 10px;
67+
li {
68+
width: 100%;
69+
}
70+
}
8571
}
8672

8773
.subtitle {
88-
font-size: 0.875em;
74+
font-size: 15px;
8975
font-style: italic;
9076
color: grey;
9177
margin-bottom: 10px;
9278
}
93-
79+
.lightblue {
80+
color: lightblue;
81+
}
82+
.red {
83+
color: red;
84+
}
9485
.faded {
9586
opacity: 0.7;
9687
}
97-
9888
.faded:hover {
99-
opacity: 0.9;
89+
opacity: 1;
10090
}
101-
102-
section {
103-
margin: 0;
91+
.pointer {
92+
cursor: pointer !important;
10493
}
105-
106-
/** Sidebar (left) and Content (right) */
107-
@media (min-width: 1200px) {
108-
.panel-wm-content .container {
109-
width: calc(1170px - #{$side-menu-width});
110-
}
94+
.padding10 {
95+
padding: 10px !important;
11196
}
112-
113-
.nav-docs {
114-
background-color: #fff;
115-
border-bottom: 1px solid #d6d6d6;
97+
.text-danger {
98+
color: red !important;
11699
}
117-
118-
.panel-wm {
119-
padding: #{$navbar-height} 0 0 0;
120-
121-
.nav-stacked {
122-
padding-bottom: 30px;
123-
124-
.nav-item {
125-
width: 100%;
126-
}
127-
}
128-
129-
.nav > li > a {
130-
padding: 10px 15px;
131-
border-radius: 0;
132-
}
133-
134-
.panel-wm-content {
135-
margin-left: $side-menu-width;
136-
padding: 0 1rem;
137-
}
138-
139-
.panel-wm-left {
140-
position: fixed;
141-
z-index: 400;
142-
transition: left 0.15s;
143-
top: $navbar-height;
144-
bottom: 0;
145-
left: 0;
146-
background-color: #f5f5f5;
147-
transform: translate3d(0, 0, 0);
148-
border-right: 1px solid #d0d0d0;
149-
overflow-y: auto;
150-
width: $side-menu-width;
151-
}
100+
.mdi-pencil.pointer:hover {
101+
color: #00bfff;
152102
}
153-
154-
.navbar {
155-
.navbar-brand {
156-
margin-right: 0px;
157-
}
158-
.logo {
159-
margin: 0 8px;
160-
}
103+
.mdi-trash-can.pointer:hover {
104+
color: #ff002b;
161105
}
162106

163107
.github-button-container {
@@ -190,7 +134,11 @@ section {
190134
background-color: #fff;
191135
/* the height is 100% minus the 2 navbars */
192136
height: calc(100vh - 56px);
193-
padding: 0 10px;
137+
padding: 0 20px;
138+
139+
#demo-container {
140+
padding-bottom: 15px;
141+
}
194142

195143
h3 {
196144
color: #333;

0 commit comments

Comments
 (0)