Skip to content

Commit 7a93930

Browse files
ChronosSFChronosSF
authored
Merge branch 'master' into sstoychev/avatars-grid-lite
2 parents 6744867 + 8767e3f commit 7a93930

44 files changed

Lines changed: 2529 additions & 2891 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/cd-matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
111111
- name: Update package.json with base href
112112
run: |
113-
sed -i 's|--configuration production|--base-href=${{ matrix.base_href }} --configuration production|g' package.json
113+
sed -i 's|--configuration production|--base-href=/${{ matrix.base_href }}/ --configuration production|g' package.json
114114
115115
- name: Generate live-editing
116116
run: npm ${{ matrix.custom_command }}

‎azure-pipelines.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
trigger: none
2+
pr: none
23

34
pool:
45
vmImage: 'ubuntu-latest'

‎live-editing/configs/BadgeConfigGenerator.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ export class BadgeConfigGenerator implements IConfigGenerator {
4040
shortenComponentPathBy: "/data-display/badge/"
4141
}));
4242

43+
configs.push(new Config({
44+
component: 'BadgeDotSampleComponent',
45+
additionalFiles: ["src/app/data-display/badge/model/member.model.ts", "src/app/data-display/badge/badge-dot-sample/badge-dot-sample.component.scss"],
46+
appConfig: BaseAppConfig,
47+
shortenComponentPathBy: "/data-display/badge/"
48+
}));
49+
4350
return configs;
4451
}
4552
}

‎package-lock.json‎

Lines changed: 1807 additions & 2737 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@
7373
"file-saver": "^2.0.2",
7474
"fuse.js": "^7.1.0",
7575
"hammerjs": "^2.0.8",
76-
"igniteui-angular": "^21.0.0",
76+
"igniteui-angular": "^21.0.10",
7777
"igniteui-angular-charts": "^20.2.0",
7878
"igniteui-angular-core": "^20.2.0",
7979
"igniteui-angular-extras": "^21.0.0",
8080
"igniteui-angular-i18n": "^21.0.0",
8181
"igniteui-dockmanager": "^1.17.0",
8282
"igniteui-grid-lite": "^0.0.1",
8383
"igniteui-live-editing": "^3.3.0",
84-
"igniteui-webcomponents": "^6.2.0",
85-
"marked": "^16.3.0",
86-
"marked-shiki": "^1.2.0",
84+
"igniteui-webcomponents": "^6.5.0",
85+
"marked": "^17.0.1",
86+
"marked-shiki": "^1.2.1",
8787
"minireset.css": "0.0.6",
8888
"postcss": "^8.5.5",
8989
"rxjs": "^7.8.2",

‎projects/app-lob/src/app/grid-finjs/grid-finjs.component.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
<igx-grid-toolbar-actions>
2222
<igx-grid-toolbar-hiding title="Indicators"></igx-grid-toolbar-hiding>
2323
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
24-
<igx-grid-toolbar-exporter [exportCSV]="false">
24+
<igx-grid-toolbar-exporter [exportCSV]="false" (exportStarted)="exportStarted($event)">
2525
<span excelText>Export to Excel</span>
26+
<span pdfText>Export to PDF</span>
2627
</igx-grid-toolbar-exporter>
2728
</igx-grid-toolbar-actions>
2829
</igx-grid-toolbar>

‎projects/app-lob/src/app/grid-finjs/grid-finjs.component.ts‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-len */
22
import { AsyncPipe, CurrencyPipe } from '@angular/common';
33
import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild, DOCUMENT, inject } from '@angular/core';
4-
import { CellType, GridSelectionMode, IGridKeydownEventArgs, IRowSelectionEventArgs, IgxCellEditorTemplateDirective, IgxCellTemplateDirective, IgxColumnComponent, IgxExcelTextDirective, IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent } from 'igniteui-angular/grids/core';
4+
import { CellType, GridSelectionMode, IColumnExportingEventArgs, IGridKeydownEventArgs, IRowSelectionEventArgs, IgxCellEditorTemplateDirective, IgxCellTemplateDirective, IgxColumnComponent, IgxExcelTextDirective, IgxExporterEvent, IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxPdfExporterOptions, IgxPdfExporterService, IgxPdfTextDirective } from 'igniteui-angular/grids/core';
55
import { DefaultSortingStrategy, IgxOverlayOutletDirective, OverlaySettings, SortingDirection } from 'igniteui-angular/core';
66
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
77
import { IgxSelectComponent, IgxSelectItemComponent } from 'igniteui-angular/select';
@@ -17,11 +17,12 @@ import { FormsModule } from '@angular/forms';
1717
selector: 'app-finjs-grid',
1818
templateUrl: './grid-finjs.component.html',
1919
styleUrls: ['./grid-finjs.component.scss'],
20-
imports: [IgxGridComponent, IgxPreventDocumentScrollDirective, IgxGridToolbarComponent, IgxGridToolbarActionsComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxGridToolbarExporterComponent, IgxExcelTextDirective, IgxColumnComponent, IgxCellEditorTemplateDirective, IgxSelectComponent, FormsModule, IgxFocusDirective, IgxSelectItemComponent, IgxCellTemplateDirective, IgxIconComponent, IgxIconButtonDirective, IgxOverlayOutletDirective, AsyncPipe, CurrencyPipe]
20+
imports: [IgxGridComponent, IgxPreventDocumentScrollDirective, IgxGridToolbarComponent, IgxGridToolbarActionsComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxGridToolbarExporterComponent, IgxExcelTextDirective, IgxPdfTextDirective, IgxColumnComponent, IgxCellEditorTemplateDirective, IgxSelectComponent, FormsModule, IgxFocusDirective, IgxSelectItemComponent, IgxCellTemplateDirective, IgxIconComponent, IgxIconButtonDirective, IgxOverlayOutletDirective, AsyncPipe, CurrencyPipe]
2121
})
2222
export class GridFinJSComponent implements OnInit {
2323
private el = inject(ElementRef);
2424
private document = inject<Document>(DOCUMENT);
25+
private pdfExportService = inject(IgxPdfExporterService);
2526
dataService = inject(SignalRService);
2627

2728
@ViewChild('grid1', { static: true }) public grid: IgxGridComponent;
@@ -116,6 +117,34 @@ export class GridFinJSComponent implements OnInit {
116117
this.chartColumnKeyDown.emit(target.row.data);
117118
}
118119

120+
public exportStarted(args: IgxExporterEvent) {
121+
(args.options as IgxPdfExporterOptions).pageSize = "A3";
122+
123+
const includedFields = new Set([
124+
'id',
125+
'category',
126+
'type',
127+
'contract',
128+
'settlement',
129+
'country',
130+
'region',
131+
'lastupdated',
132+
'openprice',
133+
'price',
134+
'change',
135+
'buy',
136+
'sell'
137+
]);
138+
139+
this.pdfExportService.columnExporting.subscribe((exportArgs: IColumnExportingEventArgs) => {
140+
const field = exportArgs.field.toLowerCase();
141+
if (!includedFields.has(field)) {
142+
exportArgs.cancel = true;
143+
}
144+
});
145+
146+
}
147+
119148
get gridWrapper(): HTMLElement {
120149
return this.el.nativeElement.querySelector('.grid__wrapper') as HTMLElement;
121150
}

‎src/app/data-display/badge/badge-dot-sample/badge-dot-sample.component.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<div class="wrapper">
2+
<igx-avatar icon="face" shape="rounded" size="small"></igx-avatar>
3+
<igx-badge dot type="success"></igx-badge>
4+
</div>

‎src/app/data-display/badge/badge-dot-sample/badge-dot-sample.component.scss‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.wrapper {
2+
display: flex;
3+
position: relative;
4+
margin-top: 15px;
5+
6+
igx-avatar {
7+
anchor-name: --avatar;
8+
}
9+
10+
igx-badge {
11+
position: absolute;
12+
position-anchor: --avatar;
13+
bottom: anchor(--avatar top);
14+
left: anchor(right);
15+
transform: translate(-75%, 75%);
16+
}
17+
}

‎src/app/data-display/badge/badge-dot-sample/badge-dot-sample.component.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Component } from '@angular/core';
2+
import { IgxAvatarComponent } from 'igniteui-angular/avatar';
3+
import { IgxBadgeComponent } from 'igniteui-angular/badge';
4+
5+
@Component({
6+
selector: 'app-badge-dot-sample',
7+
styleUrls: ['./badge-dot-sample.component.scss'],
8+
templateUrl: './badge-dot-sample.component.html',
9+
imports: [IgxAvatarComponent, IgxBadgeComponent]
10+
})
11+
export class BadgeDotSampleComponent { }

0 commit comments

Comments
 (0)