Merge branch 'master' into feat/update-selected-rows-on-filter-apply

# Conflicts:
#	projects/data-grid/src/lib/store/data-grid.ts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-grid",
-  "version": "1.20.0",
+  "version": "1.22.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -20,61 +20,61 @@
   },
   "private": false,
   "dependencies": {
-    "@angular/animations": "^15.0.3",
-    "@angular/cdk": "^15.0.2",
-    "@angular/common": "^15.0.3",
-    "@angular/compiler": "^15.0.3",
-    "@angular/core": "^15.0.3",
-    "@angular/forms": "^15.0.3",
-    "@angular/localize": "^15.0.3",
-    "@angular/platform-browser": "^15.0.3",
-    "@angular/platform-browser-dynamic": "^15.0.3",
-    "@ngrx/store": "^15.0.0",
-    "@ngrx/store-devtools": "^15.0.0",
-    "core-js": "^3.26.1",
-    "ramda": "^0.28.0",
-    "rxjs": "~7.6.0",
-    "tslib": "^2.4.1",
-    "zone.js": "~0.12.0"
+    "@angular/animations": "^16.0.3",
+    "@angular/cdk": "^16.0.2",
+    "@angular/common": "^16.0.3",
+    "@angular/compiler": "^16.0.3",
+    "@angular/core": "^16.0.3",
+    "@angular/forms": "^16.0.3",
+    "@angular/localize": "^16.0.3",
+    "@angular/platform-browser": "^16.0.3",
+    "@angular/platform-browser-dynamic": "^16.0.3",
+    "@ngrx/store": "^16.0.0",
+    "@ngrx/store-devtools": "^16.0.0",
+    "core-js": "^3.30.2",
+    "ramda": "^0.29.0",
+    "rxjs": "~7.8.1",
+    "tslib": "^2.5.2",
+    "zone.js": "~0.13.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.0.3",
-    "@angular-eslint/builder": "15.1.0",
-    "@angular-eslint/eslint-plugin": "15.1.0",
-    "@angular-eslint/eslint-plugin-template": "15.1.0",
-    "@angular-eslint/schematics": "15.1.0",
-    "@angular-eslint/template-parser": "15.1.0",
-    "@angular/cli": "^15.0.3",
-    "@angular/compiler-cli": "^15.0.3",
-    "@angular/language-service": "^15.0.3",
-    "@commitlint/cli": "^17.3.0",
-    "@commitlint/config-conventional": "^17.3.0",
-    "@commitlint/prompt": "^17.3.0",
-    "@ng-bootstrap/ng-bootstrap": "^14.0.0",
-    "@types/jasmine": "~4.3.1",
+    "@angular-devkit/build-angular": "^16.0.3",
+    "@angular-eslint/builder": "16.0.3",
+    "@angular-eslint/eslint-plugin": "16.0.3",
+    "@angular-eslint/eslint-plugin-template": "16.0.3",
+    "@angular-eslint/schematics": "16.0.3",
+    "@angular-eslint/template-parser": "16.0.3",
+    "@angular/cli": "^16.0.3",
+    "@angular/compiler-cli": "^16.0.3",
+    "@angular/language-service": "^16.0.3",
+    "@commitlint/cli": "^17.6.5",
+    "@commitlint/config-conventional": "^17.6.5",
+    "@commitlint/prompt": "^17.6.5",
+    "@ng-bootstrap/ng-bootstrap": "^15.0.0",
+    "@types/jasmine": "~4.3.2",
     "@types/jasminewd2": "~2.0.10",
-    "@types/node": "^18.11.14",
-    "@typescript-eslint/eslint-plugin": "5.46.1",
-    "@typescript-eslint/parser": "5.46.1",
+    "@types/node": "^20.2.5",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.8",
     "bootstrap": "^5.2.3",
     "coveralls": "^3.1.1",
-    "ejs": "^3.1.8",
-    "eslint": "^8.29.0",
-    "globby": "^13.1.3",
-    "husky": "^8.0.2",
-    "jasmine-core": "~4.5.0",
+    "ejs": "^3.1.9",
+    "eslint": "^8.42.0",
+    "globby": "^13.1.4",
+    "husky": "^8.0.3",
+    "jasmine-core": "~5.0.0",
     "jasmine-marbles": "^0.9.2",
     "jasmine-spec-reporter": "~7.0.0",
-    "karma": "~6.4.1",
-    "karma-chrome-launcher": "~3.1.1",
+    "karma": "~6.4.2",
+    "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "^2.0.0",
+    "karma-jasmine-html-reporter": "^2.1.0",
     "material-design-icons": "^3.0.1",
-    "ng-packagr": "^15.0.3",
+    "ng-packagr": "^16.0.1",
     "npm-run-all": "^4.1.5",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^5.0.4"
   },
   "repository": {
     "type": "git",

projects/data-grid-demo/src/app/app.component.ts

@@ -188,12 +188,15 @@ export class AppComponent implements OnInit {
     },
       {
         headerName: 'address',
-        field: ['address', 'street'],
+        field: 'address',
+        valueGetter: (dataItem: any) => `${dataItem?.address?.street} nr: ${dataItem?.address?.number}`,
         visible: true,
         sortAvailable: true,
         filterAvailable: true,
         filter: {
-          filterType: FilterType.Text
+          filterType: FilterType.Text,
+          // Filter only by the street
+          valueResolver: (dataItem: any) => dataItem?.address?.street,
         },
         component: TextComponent,
         width: 100

projects/data-grid-demo/src/app/components/number.component.ts

@@ -2,6 +2,7 @@ import { Component, Input } from '@angular/core';
 import { GridCell } from 'ngrx-data-grid';
 
 @Component({
+  selector: 'app-demo-number',
   templateUrl: 'number.component.html',
   styleUrls: ['number.component.scss']
 })

projects/data-grid-demo/src/app/components/text.component.ts

@@ -2,6 +2,7 @@ import { Component, Input } from '@angular/core';
 import { GridCell } from 'ngrx-data-grid';
 
 @Component({
+  selector: 'app-demo-text',
   templateUrl: 'text.component.html',
   styleUrls: ['text.component.scss']
 })

projects/data-grid-demo/src/styles.scss

@@ -1,5 +1,6 @@
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap');
 @import '~material-design-icons/iconfont/material-icons.css';
+@import '~@angular/cdk/overlay-prebuilt.css';
 
 * {
   margin: 0;
@@ -28,4 +29,4 @@ body {
   padding: 0;
   font-size: 1rem;
   color: #4b5154;
-}
+}