Merge branch 'vnext' into mtihova/grid-lite-angular-wrapper

Mariela Tihova · web-flow · commit 1ff9873e8769 · 2026-02-25T14:25:37.000+02:00
diff --git a/live-editing/configs/ExportPdfConfigGenerator.ts b/live-editing/configs/ExportPdfConfigGenerator.ts
@@ -12,6 +12,12 @@ export class ExportPdfConfigGenerator implements IConfigGenerator {
             appConfig: BaseAppConfig
         }));
 
+        configs.push(new Config({
+            component: 'ExportPdfCustomFontComponent',
+            additionalFiles: ['/src/app/services/export-pdf-custom-font/fonts/noto-sans.json', '/src/app/services/export-pdf-custom-font/fonts/OFL.txt'],
+            appConfig: BaseAppConfig
+        }));
+
         return configs;
     }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,15 +73,15 @@
     "file-saver": "^2.0.2",
     "fuse.js": "^7.1.0",
     "hammerjs": "^2.0.8",
-    "igniteui-angular": "^21.1.0-rc.1",
+    "igniteui-angular": "^21.1.0-rc.4",
     "igniteui-angular-charts": "^20.2.0",
     "igniteui-angular-core": "^20.2.0",
     "igniteui-angular-extras": "^21.0.0",
-    "igniteui-angular-i18n": "^21.1.0-rc.1",
+    "igniteui-angular-i18n": "^21.1.0-rc.4",
     "igniteui-dockmanager": "^1.17.0",
     "igniteui-grid-lite": "^0.5.1",
     "igniteui-i18n-resources": "^1.0.2",
-    "igniteui-live-editing": "^3.3.0",
+    "igniteui-live-editing": "^3.4.0",
     "igniteui-webcomponents": "^6.5.0",
     "marked": "^17.0.1",
     "marked-shiki": "^1.2.1",
@@ -113,8 +113,8 @@
       "@angular/compiler": "^21.0.0"
     },
     "igniteui-angular-extras": {
-      "igniteui-angular": "^21.1.0-rc.1",
-      "@infragistics/igniteui-angular": "^21.1.0-rc.1",
+      "igniteui-angular": "^21.1.0-rc.4",
+      "@infragistics/igniteui-angular": "^21.1.0-rc.4",
       "@angular/core": "^21.0.0",
       "@angular/common": "^21.0.0",
       "@angular/animations": "^21.0.0"
diff --git a/projects/app-lob/src/app/grid-finjs/grid-finjs.routes.ts b/projects/app-lob/src/app/grid-finjs/grid-finjs.routes.ts
@@ -6,7 +6,7 @@ import { GridFinJSComponent } from './grid-finjs.component';
 export const GridfinjsRoutes: Routes = [
     {
         component: FinJSDemoComponent,
-        data: gridfinjsRoutesData['empty-path'],
+        data: gridfinjsRoutesData['grid-finjs-sample'],
         path: ''
     },
     {
diff --git a/src/app/notifications/snackbar/snackbar-style/snackbar-style.component.scss b/src/app/notifications/snackbar/snackbar-style/snackbar-style.component.scss
@@ -9,4 +9,6 @@ $dark-snackbar: snackbar-theme(
 
 :host {
   @include tokens($dark-snackbar);
+  display: block;
+  height: 100vh;
 }
diff --git a/src/app/notifications/snackbar/snackbar-tailwind-style/snackbar-tailwind-style.component.scss b/src/app/notifications/snackbar/snackbar-tailwind-style/snackbar-tailwind-style.component.scss
@@ -0,0 +1,4 @@
+:host {
+    display: block;
+    height: 100vh;
+}
diff --git a/src/app/pivot-grid/pivot-datasource/pivot-data-selector-sample.component.html b/src/app/pivot-grid/pivot-datasource/pivot-data-selector-sample.component.html
@@ -8,4 +8,4 @@
 
     <igx-pivot-data-selector [grid]="grid1"></igx-pivot-data-selector>
 
-</div>
+</div>
diff --git a/src/app/services/export-csv/csv-export.component.html b/src/app/services/export-csv/csv-export.component.html
@@ -1,7 +1,7 @@
 <p>
   Press the "Export CSV Data" button below to export an array as .csv file.<br />
-  <button (click)="exportCsvButtonHandler()">Export CSV Data</button>
+  <button igxButton="contained" (click)="exportCsvButtonHandler()">Export CSV Data</button>
   <br />
   Press the "Export TSV Data" button below to export an array as .tsv file.<br />
-  <button (click)="exportTsvButtonHandler()">Export TSV Data</button><br />
-</p>
+  <button igxButton="contained" (click)="exportTsvButtonHandler()">Export TSV Data</button><br />
+</p>
diff --git a/src/app/services/export-csv/csv-export.component.ts b/src/app/services/export-csv/csv-export.component.ts
@@ -2,11 +2,13 @@
 import { Component, inject } from '@angular/core';
 
 import { CsvFileTypes, IgxCsvExporterOptions, IgxCsvExporterService } from 'igniteui-angular/grids/core';
+import { IgxButtonDirective } from 'igniteui-angular/directives';
 
 @Component({
     selector: 'app-csv-export',
     styleUrls: ['./csv-export.component.scss'],
-    templateUrl: './csv-export.component.html'
+    templateUrl: './csv-export.component.html',
+    imports: [IgxButtonDirective]
 })
 export class CsvExportComponent {
   private csvExportService = inject(IgxCsvExporterService);
diff --git a/src/app/services/export-excel/excel-export.component.html b/src/app/services/export-excel/excel-export.component.html
@@ -1,4 +1,4 @@
 <p>
   Press the "Export Data" button below to export an array as .xlsx file.<br />
-  <button (click)="exportButtonHandler()">Export Data</button><br />
+  <button igxButton="contained" (click)="exportButtonHandler()">Export Data</button><br />
 </p>
diff --git a/src/app/services/export-excel/excel-export.component.ts b/src/app/services/export-excel/excel-export.component.ts
@@ -2,11 +2,13 @@
 import { Component, inject } from '@angular/core';
 
 import { IgxExcelExporterOptions, IgxExcelExporterService } from 'igniteui-angular/grids/core';
+import { IgxButtonDirective } from 'igniteui-angular/directives';
 
 @Component({
     selector: 'app-excel-export',
     styleUrls: ['./excel-export.component.scss'],
-    templateUrl: './excel-export.component.html'
+    templateUrl: './excel-export.component.html',
+    imports: [IgxButtonDirective]
 })
 export class ExcelExportComponent {
   private excelExportService = inject(IgxExcelExporterService);
diff --git a/src/app/services/export-pdf-custom-font/export-pdf-custom-font.component.ts b/src/app/services/export-pdf-custom-font/export-pdf-custom-font.component.ts
@@ -1,16 +1,17 @@
-import { ChangeDetectionStrategy, Component, signal, computed, inject, viewChild, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, signal, computed, inject, viewChild } from '@angular/core';
 import { IgxColumnComponent, IgxPdfExporterService, IgxPdfExporterOptions } from 'igniteui-angular/grids/core';
 import { IgxGridComponent } from 'igniteui-angular/grids/grid';
+import notoSansFontData from './fonts/noto-sans.json';
 
 /**
  * Demonstrates PDF export with a custom Unicode font.
  *
  * The sample ships with Noto Sans (Latin/Cyrillic/Greek) loaded from
- * assets/fonts/noto-sans.json. Users can also upload their own .ttf font —
+ * fonts/noto-sans.json. Users can also upload their own .ttf font —
  * for example Noto Sans CJK for Japanese/Chinese/Korean support.
  *
  * All Noto fonts are licensed under the SIL Open Font License 1.1
- * (see assets/fonts/OFL.txt).
+ * (see fonts/OFL.txt).
  */
 @Component({
     selector: 'app-export-pdf-custom-font',
@@ -19,7 +20,7 @@ import { IgxGridComponent } from 'igniteui-angular/grids/grid';
     changeDetection: ChangeDetectionStrategy.OnPush,
     imports: [IgxGridComponent, IgxColumnComponent]
 })
-export class ExportPdfCustomFontComponent implements OnInit {
+export class ExportPdfCustomFontComponent {
     private pdfExporter = inject(IgxPdfExporterService);
 
     protected readonly grid = viewChild.required<IgxGridComponent>('grid');
@@ -48,32 +49,12 @@ export class ExportPdfCustomFontComponent implements OnInit {
         { Name: 'Ирина Петрова', City: 'Санкт-Петербург', Product: '製品 F', Amount: 2890 }
     ]);
 
-    public ngOnInit(): void {
-        this.loadBuiltInFont();
-    }
-
-    /** Loads the built-in Noto Sans font from application assets. */
-    private async loadBuiltInFont(): Promise<void> {
-        this.builtInFontLoading.set(true);
-        this.exportStatus.set('Loading built-in Noto Sans font…');
-
-        try {
-            const response = await fetch('assets/fonts/noto-sans.json');
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}`);
-            }
-            const fontJson: { normal: string; bold: string } = await response.json();
-
-            this.builtInFontData = fontJson.normal;
-            this.builtInBoldFontData = fontJson.bold;
-            this.builtInFontLoaded.set(true);
-            this.exportStatus.set('Noto Sans loaded — ready to export. Upload a CJK font for Japanese/Chinese/Korean support.');
-        } catch (error) {
-            console.error('Failed to load built-in font:', error);
-            this.exportStatus.set('Failed to load built-in Noto Sans font.');
-        } finally {
-            this.builtInFontLoading.set(false);
-        }
+    constructor() {
+        const fontJson = notoSansFontData as unknown as { normal: string; bold: string };
+        this.builtInFontData = fontJson.normal;
+        this.builtInBoldFontData = fontJson.bold;
+        this.builtInFontLoaded.set(true);
+        this.exportStatus.set('Noto Sans loaded — ready to export. Upload a CJK font for Japanese/Chinese/Korean support.');
     }
 
     /** Handles the user uploading a custom .ttf font file. */
diff --git a/src/app/services/export-pdf-custom-font/fonts/OFL.txt b/src/app/services/export-pdf-custom-font/fonts/OFL.txt
diff --git a/src/app/services/export-pdf-custom-font/fonts/noto-sans.json b/src/app/services/export-pdf-custom-font/fonts/noto-sans.json
diff --git a/src/app/services/transaction/transaction-base/transaction-base.component.ts b/src/app/services/transaction/transaction-base/transaction-base.component.ts
@@ -6,13 +6,14 @@ import { IgxIconComponent } from 'igniteui-angular/icon';
 import { WISHLIST, WishlistItem } from '../data';
 import { NgClass } from '@angular/common';
 import { TransactionBasePipe } from '../pipes/transaction-base.pipe';
+import { IgxButtonDirective } from 'igniteui-angular/directives';
 
 @Component({
     providers: [IgxTransactionService],
     selector: 'app-transaction-base',
     styleUrls: ['./transaction-base.component.scss'],
     templateUrl: 'transaction-base.component.html',
-    imports: [IgxCardComponent, IgxListComponent, IgxListItemComponent, NgClass, IgxListLineTitleDirective, IgxListLineSubTitleDirective, IgxIconComponent, IgxListActionDirective, TransactionBasePipe]
+    imports: [IgxButtonDirective, IgxCardComponent, IgxListComponent, IgxListItemComponent, NgClass, IgxListLineTitleDirective, IgxListLineSubTitleDirective, IgxIconComponent, IgxListActionDirective, TransactionBasePipe]
 })
 export class TransactionBaseComponent {
     transactions = inject<IgxTransactionService<Transaction, State>>(IgxTransactionService);

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,12 @@ export class ExportPdfConfigGenerator implements IConfigGenerator {`
`12`	`12`	`appConfig: BaseAppConfig`
`13`	`13`	`}));`
`14`	`14`
	`15`	`+ configs.push(new Config({`
	`16`	`+ component: 'ExportPdfCustomFontComponent',`
	`17`	`+ additionalFiles: ['/src/app/services/export-pdf-custom-font/fonts/noto-sans.json', '/src/app/services/export-pdf-custom-font/fonts/OFL.txt'],`
	`18`	`+ appConfig: BaseAppConfig`
	`19`	`+ }));`
	`20`	`+`
`15`	`21`	`return configs;`
`16`	`22`	`}`
`17`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { GridFinJSComponent } from './grid-finjs.component';`
`6`	`6`	`export const GridfinjsRoutes: Routes = [`
`7`	`7`	`{`
`8`	`8`	`component: FinJSDemoComponent,`
`9`		`- data: gridfinjsRoutesData['empty-path'],`
	`9`	`+ data: gridfinjsRoutesData['grid-finjs-sample'],`
`10`	`10`	`path: ''`
`11`	`11`	`},`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,6 @@ $dark-snackbar: snackbar-theme(`
`9`	`9`
`10`	`10`	`:host {`
`11`	`11`	`@include tokens($dark-snackbar);`
	`12`	`+ display: block;`
	`13`	`+ height: 100vh;`
`12`	`14`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +:host {
 +    display: block;
 +    height: 100vh;
 +}
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`
`9`	`9`	`<igx-pivot-data-selector [grid]="grid1"></igx-pivot-data-selector>`
`10`	`10`
`11`		`-</div>`
	`11`	`+</div>`