Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit f6ed853

Browse files
ghiscodingghiscoding
committed
Merge branch 'master' into bugfix/draggable-on-group-changed-callback
2 parents ff08f4b + 7991e97 commit f6ed853

18 files changed

+375
-292
lines changed

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ on:
88
pull_request:
99
branches:
1010
- '**'
11-
env:
12-
CI: true
13-
PREFERRED_WORKSPACE_MANAGER: yarn
1411

1512
jobs:
1613
run:
@@ -48,7 +45,11 @@ jobs:
4845

4946
- name: Upload Jest coverage to Codecov
5047
if: "!contains(github.event.head_commit.message, 'chore: release')"
51-
run: bash <(curl -s https://codecov.io/bash)
48+
uses: codecov/codecov-action@v3
49+
with:
50+
token: ${{ secrets.CODECOV_TOKEN }}
51+
directory: test/jest-coverage
52+
verbose: true
5253

5354
- name: Start server in the background
5455
run: yarn start &
@@ -80,4 +81,4 @@ jobs:
8081
uses: peaceiris/actions-gh-pages@v3
8182
with:
8283
github_token: ${{ secrets.GITHUB_TOKEN }}
83-
publish_dir: ./docs
84+
publish_dir: ./docs

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
44
[![TypeScript](https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg)](http://www.typescriptlang.org/)
55
[![NPM downloads](https://img.shields.io/npm/dy/angular-slickgrid)](https://npmjs.org/package/angular-slickgrid)
6-
[![npm](https://img.shields.io/npm/v/angular-slickgrid.svg)](https://www.npmjs.com/package/angular-slickgrid)
6+
[![npm](https://img.shields.io/npm/v/angular-slickgrid.svg?logo=npm&logoColor=fff&label=npm)](https://www.npmjs.com/package/angular-slickgrid)
77

88
[![Actions Status](https://github.com/ghiscoding/Angular-Slickgrid/workflows/CI%20Build/badge.svg)](https://github.com/ghiscoding/Angular-Slickgrid/actions)
99
[![Cypress.io](https://img.shields.io/badge/tested%20with-Cypress-04C38E.svg)](https://www.cypress.io/)

‎package.json‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
"url": "https://ko-fi.com/ghiscoding"
5050
},
5151
"dependencies": {
52-
"@slickgrid-universal/common": "~2.1.1",
53-
"@slickgrid-universal/custom-footer-component": "~2.1.1",
54-
"@slickgrid-universal/empty-warning-component": "~2.1.1",
55-
"@slickgrid-universal/event-pub-sub": "~2.1.1",
56-
"@slickgrid-universal/pagination-component": "~2.1.1",
57-
"@slickgrid-universal/row-detail-view-plugin": "~2.1.1",
58-
"@slickgrid-universal/rxjs-observable": "~2.1.1",
52+
"@slickgrid-universal/common": "~2.1.2",
53+
"@slickgrid-universal/custom-footer-component": "~2.1.2",
54+
"@slickgrid-universal/empty-warning-component": "~2.1.2",
55+
"@slickgrid-universal/event-pub-sub": "~2.1.2",
56+
"@slickgrid-universal/pagination-component": "~2.1.2",
57+
"@slickgrid-universal/row-detail-view-plugin": "~2.1.2",
58+
"@slickgrid-universal/rxjs-observable": "~2.1.2",
5959
"@types/jquery": "^3.5.14",
6060
"dequal": "^2.0.3",
6161
"dompurify": "^2.4.1",
@@ -68,61 +68,61 @@
6868
},
6969
"devDependencies": {
7070
"@angular-devkit/build-angular": "^14.2.10",
71-
"@angular-eslint/builder": "^14.3.0",
72-
"@angular-eslint/eslint-plugin": "^14.3.0",
73-
"@angular-eslint/eslint-plugin-template": "^14.3.0",
74-
"@angular-eslint/schematics": "^14.3.0",
75-
"@angular-eslint/template-parser": "^14.3.0",
76-
"@angular/animations": "^14.2.11",
71+
"@angular-eslint/builder": "^14.4.0",
72+
"@angular-eslint/eslint-plugin": "^14.4.0",
73+
"@angular-eslint/eslint-plugin-template": "^14.4.0",
74+
"@angular-eslint/schematics": "^14.4.0",
75+
"@angular-eslint/template-parser": "^14.4.0",
76+
"@angular/animations": "^14.2.12",
7777
"@angular/cli": "^14.2.10",
78-
"@angular/common": "^14.2.11",
79-
"@angular/compiler": "^14.2.11",
80-
"@angular/compiler-cli": "^14.2.11",
81-
"@angular/core": "^14.2.11",
82-
"@angular/forms": "^14.2.11",
83-
"@angular/language-service": "^14.2.11",
84-
"@angular/platform-browser": "^14.2.11",
85-
"@angular/platform-browser-dynamic": "^14.2.11",
86-
"@angular/router": "^14.2.11",
78+
"@angular/common": "^14.2.12",
79+
"@angular/compiler": "^14.2.12",
80+
"@angular/compiler-cli": "^14.2.12",
81+
"@angular/core": "^14.2.12",
82+
"@angular/forms": "^14.2.12",
83+
"@angular/language-service": "^14.2.12",
84+
"@angular/platform-browser": "^14.2.12",
85+
"@angular/platform-browser-dynamic": "^14.2.12",
86+
"@angular/router": "^14.2.12",
8787
"@faker-js/faker": "^7.6.0",
8888
"@fnando/sparkline": "^0.3.10",
8989
"@ng-select/ng-select": "^9.1.0",
9090
"@ngx-translate/core": "^14.0.0",
9191
"@ngx-translate/http-loader": "^7.0.0",
9292
"@release-it/conventional-changelog": "^5.1.1",
93-
"@slickgrid-universal/composite-editor-component": "~2.1.1",
94-
"@slickgrid-universal/custom-tooltip-plugin": "~2.1.1",
95-
"@slickgrid-universal/excel-export": "~2.1.1",
96-
"@slickgrid-universal/graphql": "~2.1.1",
97-
"@slickgrid-universal/odata": "~2.1.1",
98-
"@slickgrid-universal/text-export": "~2.1.1",
93+
"@slickgrid-universal/composite-editor-component": "~2.1.2",
94+
"@slickgrid-universal/custom-tooltip-plugin": "~2.1.2",
95+
"@slickgrid-universal/excel-export": "~2.1.2",
96+
"@slickgrid-universal/graphql": "~2.1.2",
97+
"@slickgrid-universal/odata": "~2.1.2",
98+
"@slickgrid-universal/text-export": "~2.1.2",
9999
"@types/dompurify": "^2.4.0",
100100
"@types/flatpickr": "^3.1.2",
101101
"@types/fnando__sparkline": "^0.3.4",
102102
"@types/jest": "^29.2.3",
103103
"@types/jquery": "^3.5.14",
104104
"@types/moment": "^2.13.0",
105-
"@types/node": "^18.11.9",
105+
"@types/node": "^18.11.10",
106106
"@types/sortablejs": "^1.15.0",
107107
"@types/text-encoding-utf-8": "^1.0.2",
108-
"@typescript-eslint/eslint-plugin": "^5.43.0",
109-
"@typescript-eslint/parser": "^5.43.0",
108+
"@typescript-eslint/eslint-plugin": "^5.45.0",
109+
"@typescript-eslint/parser": "^5.45.0",
110110
"autoprefixer": "^10.4.13",
111-
"bootstrap": "^5.2.2",
111+
"bootstrap": "^5.2.3",
112112
"copyfiles": "^2.4.1",
113113
"cross-env": "^7.0.3",
114114
"custom-event-polyfill": "^1.0.7",
115-
"eslint": "^8.27.0",
115+
"eslint": "^8.28.0",
116116
"font-awesome": "^4.7.0",
117117
"jest": "^29.3.1",
118-
"jest-extended": "^3.1.0",
119-
"jest-preset-angular": "^12.2.2",
118+
"jest-extended": "^3.2.0",
119+
"jest-preset-angular": "^12.2.3",
120120
"moment-mini": "^2.29.4",
121121
"ng-packagr": "^14.3.0",
122122
"ngx-bootstrap": "^9.0.0",
123123
"npm-run-all2": "^6.0.4",
124124
"postcss": "^8.4.19",
125-
"postcss-cli": "^10.0.0",
125+
"postcss-cli": "^10.1.0",
126126
"release-it": "^15.5.0",
127127
"rimraf": "^3.0.2",
128128
"sass": "^1.56.1",
@@ -137,6 +137,6 @@
137137
"npm": ">=6.14.13"
138138
},
139139
"resolutions": {
140-
"caniuse-lite": "1.0.30001431"
140+
"caniuse-lite": "1.0.30001435"
141141
}
142142
}

‎src/app/examples/grid-angular.component.scss‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,34 @@ h3 {
22
font-style: normal;
33
color: #3d3d3d;
44
}
5+
6+
:root {
7+
/* you can change all filters heights via CSS variable */
8+
--slick-header-input-height: 34px;
9+
}
10+
11+
#slickGridContainer-grid22 {
12+
.slickgrid-container {
13+
.slick-headerrow-column {
14+
.ng-input {
15+
input {
16+
height: 100%;
17+
}
18+
}
19+
}
20+
}
21+
}
22+
23+
.ng-select-focused {
24+
box-shadow: 0 0 0 0.25rem #0d6efd40;
25+
}
26+
527
.cell-menu-dropdown {
628
border: 1px solid #a3a3a3;
729
border-radius: 5px;
30+
display: flex;
31+
align-items: center;
32+
height: 100%;
833
width: max-content;
934
padding: 0 14px;
1035
cursor: pointer;
@@ -16,23 +41,4 @@ h3 {
1641
.fa-caret-down {
1742
margin-left: 5px;
1843
}
19-
}
20-
21-
#slickGridContainer-grid22 {
22-
.slickgrid-container {
23-
.slick-headerrow-column {
24-
.ng-input {
25-
padding-top: -4px !important;
26-
padding-left: 4px !important;
27-
}
28-
}
29-
.slick-cell {
30-
line-height: 30px !important;
31-
}
32-
}
33-
34-
input.slider-filter-input[type=range],
35-
.form-control {
36-
height: 34px !important;
37-
}
38-
}
44+
}

‎src/app/examples/grid-angular.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ export class GridAngularComponent implements OnInit {
227227
name: 'Action',
228228
field: 'id',
229229
maxWidth: 100,
230-
formatter: () => `<div class="cell-menu-dropdown-outline">Action<i class="fa fa-caret-down"></i></div>`,
230+
formatter: () => `<div class="cell-menu-dropdown">Action<i class="fa fa-caret-down"></i></div>`,
231231
cellMenu: {
232232
commandTitle: 'Commands',
233233
commandItems: [

‎src/app/examples/grid-autoheight.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h2>
3434
<input type="text" class="form-control" data-test="search-value-input" name="searchValue"
3535
placeholder="search value" autocomplete="off" (input)="updateFilter()" [(ngModel)]="searchValue">
3636
<button class="btn btn-outline-secondary d-flex align-items-center pl-2 pr-2" data-test="clear-search-value"
37-
(click)="cleargridSearchInput()">
37+
(click)="clearGridSearchInput()">
3838
<span class="fa fa-times"></span>
3939
</button>
4040
</div>

‎src/app/examples/grid-autoheight.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export class GridAutoHeightComponent implements OnInit {
132132
// -- if any of the Search form input changes, we'll call the updateFilter() method
133133
//
134134

135-
cleargridSearchInput() {
135+
clearGridSearchInput() {
136136
this.searchValue = '';
137137
this.updateFilter();
138138
}

‎src/app/examples/grid-composite-editor.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h2>
7171
(onCellChange)="handleOnCellChange($event.detail.eventData, $event.detail.args)"
7272
(onClick)="handleOnCellClicked($event.detail.eventData, $event.detail.args)"
7373
(onCompositeEditorChange)="handleOnCompositeEditorChange($event.detail.eventData, $event.detail.args)"
74-
(onItemDeleted)="handleItemDeleted($event.detail.eventData, $event.detail.args)"
74+
(onItemDeleted)="handleItemDeleted($event.detail)"
7575
(onGridStateChanged)="handleOnGridStateChanged($event.detail)"
7676
(onPaginationChanged)="handleReRenderUnsavedStyling()"
7777
(onFilterChanged)="handleReRenderUnsavedStyling()"

‎src/app/examples/grid-composite-editor.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ export class GridCompositeEditorComponent implements OnInit {
506506
return false;
507507
}
508508

509-
handleItemDeleted(_e: Event, args: any) {
510-
console.log('item deleted with id:', args.itemId);
509+
handleItemDeleted(itemId: string) {
510+
console.log('item deleted with id:', itemId);
511511
}
512512

513513
handleOnBeforeEditCell(e: Event, args: any) {

‎src/app/examples/grid-remote.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h2>
3131
<angular-slickgrid gridId="grid18" [columnDefinitions]="columnDefinitions" [gridOptions]="gridOptions"
3232
[dataset]="dataset" [customDataView]="customDataView"
3333
(onAngularGridCreated)="angularGridReady($event.detail)"
34-
(onViewportChanged)="onViewportChanged($event.detail.eventData, $event.detail.args)"
34+
(onViewportChanged)="onViewportChanged()"
3535
(onSort)="onSort($event.detail.eventData, $event.detail.args)">
3636
</angular-slickgrid>
3737
</div>

0 commit comments

Comments
 (0)