Merge branch '26_1' into 26_1_2978-strict-mode

Signed-off-by: Andrei Kharitonov <pharret31@gmail.com>

Author: pharret31

apps/angular/angular.json

@@ -11,18 +11,22 @@
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/sandbox",
+            "outputPath": {
+              "base": "dist/sandbox"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts"
+            ],
             "tsConfig": "src/tsconfig.app.json",
             "styles": [
               "node_modules/devextreme/dist/css/dx.common.css",
               "node_modules/devextreme/dist/css/dx.light.css"
             ],
-            "scripts": []
+            "scripts": [],
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -35,12 +39,9 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -53,26 +54,23 @@
               "optimization": false,
               "outputHashing": "none",
               "sourceMap": true,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": false
+              "extractLicenses": true
             }
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "sandbox:build"
+            "buildTarget": "sandbox:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "sandbox:build:production"
+              "buildTarget": "sandbox:build:production"
             },
             "dev": {
-              "browserTarget": "sandbox:build:dev"
+              "buildTarget": "sandbox:build:dev"
             }
           }
         },
@@ -93,6 +91,5 @@
         }
       }
     }
-  },
-  "defaultProject": "sandbox"
+  }
 }

apps/angular/package.json

@@ -6,32 +6,28 @@
   "author": "Developer Express Inc.",
   "license": "MIT",
   "dependencies": {
-    "@angular/animations": "17.3.12",
-    "@angular/common": "17.3.12",
-    "@angular/compiler": "17.3.12",
-    "@angular/compiler-cli": "17.3.12",
-    "@angular/core": "17.3.12",
-    "@angular/forms": "17.3.12",
-    "@angular/platform-browser": "17.3.12",
-    "@angular/platform-browser-dynamic": "17.3.12",
-    "@angular/router": "17.3.12",
+    "@angular/common": "catalog:angular",
+    "@angular/compiler": "catalog:angular",
+    "@angular/compiler-cli": "catalog:angular",
+    "@angular/core": "catalog:angular",
+    "@angular/forms": "catalog:angular",
+    "@angular/platform-browser": "catalog:angular",
+    "@angular/platform-browser-dynamic": "catalog:angular",
+    "@angular/router": "catalog:angular",
     "core-js": "^2.6.12",
     "devextreme": "workspace:*",
     "devextreme-angular": "workspace:*",
-    "rxjs": "7.8.1",
     "tslib": "^2.6.1",
-    "zone.js": "0.14.10"
+    "zone.js": "catalog:angular"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "17.3.11",
-    "@angular/cli": "17.3.11",
-    "@angular/language-service": "17.3.12",
-    "@angular/platform-server": "17.3.12",
+    "@angular-devkit/build-angular": "catalog:angular",
+    "@angular/cli": "catalog:angular",
     "@types/jasmine": "5.1.4",
     "@types/node": "20.11.17",
     "cross-env": "7.0.3",
     "ts-node": "10.9.2",
-    "typescript": "5.4.5"
+    "typescript": "catalog:angular"
   },
   "scripts": {
     "ng": "ng",

apps/angular/src/app/app.component.ts

@@ -1,5 +1,4 @@
 /* tslint:disable:component-selector */
-
 import {
   Component,
   OnInit,
@@ -95,7 +94,8 @@ import ArrayStore from 'devextreme/data/array_store';
     CustomerService,
     AppointmentService,
     OwnerService
-  ]
+  ],
+  standalone: false
 })
 export class AppComponent implements OnInit, AfterViewInit {
   @ViewChild(DxPopoverComponent) popover: DxPopoverComponent;

apps/angular/src/app/app.module.ts

@@ -3,7 +3,6 @@ import { BrowserModule } from '@angular/platform-browser';
 import { ReactiveFormsModule } from '@angular/forms';
 import { AppComponent } from './app.component';
 
-
 import { DevExtremeModule } from 'devextreme-angular';
 
 @NgModule({

apps/angular/tsconfig.json

@@ -5,12 +5,11 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
-    "module": "es2015",
+    "module": "ES2022",
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
-    "target": "es5",
     "typeRoots": [
       "node_modules/@types"
     ],

apps/demos/Demos/Button/PredefinedTypes/React/App.tsx

@@ -1,13 +1,14 @@
 import React from 'react';
-import { Button, type ButtonTypes } from 'devextreme-react/button';
+import { Button } from 'devextreme-react/button';
+import type { ButtonTypes } from 'devextreme-react/button';
 import notify from 'devextreme/ui/notify';
 
-const onClick = (e: ButtonTypes.ClickEvent) => {
-  const buttonText = e.component.option('text');
+const onClick = (e: ButtonTypes.ClickEvent): void => {
+  const buttonText = e.component.option('text') ?? '';
   notify(`The ${capitalize(buttonText)} button was clicked`);
 };
 
-function capitalize(text: string) {
+function capitalize(text: string): string {
   return text.charAt(0).toUpperCase() + text.slice(1);
 }
 

apps/demos/Demos/Button/PredefinedTypes/ReactJs/App.js

@@ -3,7 +3,7 @@ import { Button } from 'devextreme-react/button';
 import notify from 'devextreme/ui/notify';
 
 const onClick = (e) => {
-  const buttonText = e.component.option('text');
+  const buttonText = e.component.option('text') ?? '';
   notify(`The ${capitalize(buttonText)} button was clicked`);
 };
 function capitalize(text) {

apps/demos/Demos/Charts/AjaxRequest/React/App.tsx

@@ -9,7 +9,7 @@ import Chart, {
   Tick,
 } from 'devextreme-react/chart';
 
-const customizeText = (e) => `Day ${e.value}`;
+const customizeText = (e: { value: string | number | Date }): string => `Day ${e.value}`;
 
 function App() {
   return (

apps/demos/Demos/Charts/Annotation/React/App.tsx

@@ -14,7 +14,7 @@ import {
 } from 'devextreme-react/chart';
 import { dataSource, annotationSources } from './data.ts';
 
-const customizeTooltip = (annotation) => ({
+const customizeTooltip = (annotation: { description: string }): Record<string, string> => ({
   html: `<div class='tooltip'>${annotation.description}</div>`,
 });
 

apps/demos/Demos/Charts/AreaSelectionZooming/React/App.tsx

@@ -11,23 +11,23 @@ import Chart, {
   Crosshair,
   Legend,
   Border,
-  type ChartTypes,
 } from 'devextreme-react/chart';
+import type { ChartTypes, ChartRef } from 'devextreme-react/chart';
 import Button from 'devextreme-react/button';
 import { birthLife } from './data.ts';
 
-function customizeTooltip(pointInfo: ChartTypes.CommonPointInfo) {
-  const { data } = pointInfo.point;
+function customizeTooltip(pointInfo: ChartTypes.CommonPointInfo): Record<string, string> {
+  const { data } = pointInfo.point ?? {};
   return {
     text: `${data.country} ${data.year}`,
   };
 }
 
 function App() {
-  const chartRef = useRef(null);
+  const chartRef = useRef<ChartRef>(null);
 
   const resetZoom = useCallback(() => {
-    chartRef.current.instance().resetVisualRange();
+    chartRef.current?.instance().resetVisualRange();
   }, []);
 
   return (