Skip to content

Commit 5809965

Browse files
committed
feat: reimplement highlight row, node-extend also fixes #1332, #1333
- fixes #1332, #1333 - possibly (and hopefully) fixes #1334 by using the new reimplementation of node-extend that is used for merging grid options and other sections of Slickgrid-Universal object merging & extending
1 parent 87766e9 commit 5809965

File tree

3 files changed

+171
-164
lines changed

3 files changed

+171
-164
lines changed

package.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
},
5151
"dependencies": {
5252
"@ngx-translate/core": "^15.0.0",
53-
"@slickgrid-universal/common": "~4.0.3",
54-
"@slickgrid-universal/custom-footer-component": "~4.0.3",
55-
"@slickgrid-universal/empty-warning-component": "~4.0.3",
56-
"@slickgrid-universal/event-pub-sub": "~4.0.2",
57-
"@slickgrid-universal/pagination-component": "~4.0.3",
58-
"@slickgrid-universal/row-detail-view-plugin": "~4.0.3",
59-
"@slickgrid-universal/rxjs-observable": "~4.0.3",
53+
"@slickgrid-universal/common": "~4.1.0",
54+
"@slickgrid-universal/custom-footer-component": "~4.1.0",
55+
"@slickgrid-universal/empty-warning-component": "~4.1.0",
56+
"@slickgrid-universal/event-pub-sub": "~4.1.0",
57+
"@slickgrid-universal/pagination-component": "~4.1.0",
58+
"@slickgrid-universal/row-detail-view-plugin": "~4.1.0",
59+
"@slickgrid-universal/rxjs-observable": "~4.1.0",
6060
"dequal": "^2.0.3",
6161
"dompurify": "^3.0.6",
6262
"rxjs": "^7.8.1",
@@ -87,20 +87,20 @@
8787
"@ngx-translate/http-loader": "^8.0.0",
8888
"@popperjs/core": "^2.11.8",
8989
"@release-it/conventional-changelog": "^8.0.1",
90-
"@slickgrid-universal/composite-editor-component": "~4.0.3",
91-
"@slickgrid-universal/custom-tooltip-plugin": "~4.0.3",
92-
"@slickgrid-universal/excel-export": "~4.0.3",
93-
"@slickgrid-universal/graphql": "~4.0.3",
94-
"@slickgrid-universal/odata": "~4.0.3",
95-
"@slickgrid-universal/text-export": "~4.0.3",
90+
"@slickgrid-universal/composite-editor-component": "~4.1.0",
91+
"@slickgrid-universal/custom-tooltip-plugin": "~4.1.0",
92+
"@slickgrid-universal/excel-export": "~4.1.0",
93+
"@slickgrid-universal/graphql": "~4.1.0",
94+
"@slickgrid-universal/odata": "~4.1.0",
95+
"@slickgrid-universal/text-export": "~4.1.0",
9696
"@types/dompurify": "^3.0.5",
9797
"@types/flatpickr": "^3.1.2",
9898
"@types/fnando__sparkline": "^0.3.7",
9999
"@types/jest": "^29.5.11",
100-
"@types/node": "^20.10.4",
100+
"@types/node": "^20.10.5",
101101
"@types/sortablejs": "^1.15.7",
102-
"@typescript-eslint/eslint-plugin": "^6.14.0",
103-
"@typescript-eslint/parser": "^6.14.0",
102+
"@typescript-eslint/eslint-plugin": "^6.15.0",
103+
"@typescript-eslint/parser": "^6.15.0",
104104
"bootstrap": "^5.3.2",
105105
"copyfiles": "^2.4.1",
106106
"custom-event-polyfill": "^1.0.7",
@@ -112,7 +112,7 @@
112112
"jest-extended": "^4.0.2",
113113
"jest-preset-angular": "^13.1.4",
114114
"moment-mini": "^2.29.4",
115-
"ng-packagr": "^17.0.2",
115+
"ng-packagr": "^17.0.3",
116116
"ngx-bootstrap": "^12.0.0",
117117
"npm-run-all2": "^6.1.1",
118118
"release-it": "^17.0.1",

src/app/modules/angular-slickgrid/components/angular-slickgrid.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
SlickDataView,
3636
SlickEventHandler,
3737
SlickGrid,
38-
Utils as SlickUtils,
3938
} from '@slickgrid-universal/common';
4039

4140
import {
@@ -72,6 +71,7 @@ import { SlickEmptyWarningComponent } from '@slickgrid-universal/empty-warning-c
7271
import { SlickFooterComponent } from '@slickgrid-universal/custom-footer-component';
7372
import { SlickPaginationComponent } from '@slickgrid-universal/pagination-component';
7473
import { RxJsResource } from '@slickgrid-universal/rxjs-observable';
74+
import { extend } from '@slickgrid-universal/utils';
7575
import { dequal } from 'dequal/lite';
7676

7777
import { Constants } from '../constants';
@@ -1211,7 +1211,7 @@ export class AngularSlickgridComponent<TData = any> implements AfterViewInit, On
12111211
gridOptions.enablePagination = ((gridOptions.backendServiceApi && gridOptions.enablePagination === undefined) ? true : gridOptions.enablePagination) || false;
12121212

12131213
// use extend to deep merge & copy to avoid immutable properties being changed in GlobalGridOptions after a route change
1214-
const options = SlickUtils.extend(true, {}, GlobalGridOptions, this.forRootConfig, gridOptions) as GridOption;
1214+
const options = extend(true, {}, GlobalGridOptions, this.forRootConfig, gridOptions) as GridOption;
12151215

12161216
// using copy extend to do a deep clone has an unwanted side on objects and pageSizes but ES6 spread has other worst side effects
12171217
// so we will just overwrite the pageSizes when needed, this is the only one causing issues so far.

0 commit comments

Comments
 (0)