Skip to content

Commit be2bac9

Browse files
ddinchevaddincheva
authored
Merge branch '11.0.x' into row-edit-temp-emit-evt-btns-args
2 parents 26fb431 + 83f7761 commit be2bac9

29 files changed

+2140
-58
lines changed

‎projects/igniteui-angular/src/lib/calendar/calendar.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -638,13 +638,13 @@ export class IgxCalendarComponent extends IgxMonthPickerBaseDirective implements
638638
this.activeViewIdx = activeViewIdx;
639639
requestAnimationFrame(() => {
640640
this.monthsView.date = args;
641-
this.focusMonth(event.target);
641+
this.focusMonth();
642642
});
643643
}
644644

645-
private focusMonth(target: HTMLElement) {
645+
private focusMonth() {
646646
const month = this.monthsView.monthsRef.find((e) =>
647-
e.index === parseInt(target.parentElement.attributes['data-month'].value, 10));
647+
e.index === this.monthsView.date.getMonth());
648648
if (month) { month.nativeElement.focus(); }
649649
}
650650

‎projects/igniteui-angular/src/lib/grids/common/pipes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ export class IgxSortActionColumnsPipe implements PipeTransform {
268268
@Pipe({ name: 'dataMapper' })
269269
export class IgxGridDataMapperPipe implements PipeTransform {
270270

271-
transform(data: any[], field: string, _: number) {
271+
transform(data: any[], field: string, _: number, __: any) {
272272
return resolveNestedPath(data, field);
273273
}
274274
}

‎projects/igniteui-angular/src/lib/grids/grid/grid-row.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
[style.left]="col.rightPinnedOffset"
120120
[width]="col.getCellWidth()"
121121
[visibleColumnIndex]="col.visibleIndex"
122-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
122+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
123123
[cellTemplate]="col.bodyTemplate"
124124
[lastSearchInfo]="grid.lastSearchInfo"
125125
[active]="isCellActive(col.visibleIndex)"
@@ -151,7 +151,7 @@
151151
[style.flex-basis]="col.width"
152152
[width]="col.getCellWidth()"
153153
[visibleColumnIndex]="col.visibleIndex"
154-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
154+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
155155
[cellTemplate]="col.bodyTemplate"
156156
[lastSearchInfo]="grid.lastSearchInfo"
157157
[active]="isCellActive(col.visibleIndex)"
@@ -187,7 +187,7 @@
187187
[style.min-height.px]="cellHeight"
188188
[rowData]="rowData"
189189
[visibleColumnIndex]="col.visibleIndex"
190-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
190+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
191191
[cellTemplate]="col.bodyTemplate"
192192
[lastSearchInfo]="grid.lastSearchInfo"
193193
[active]="isCellActive(col.visibleIndex)"
@@ -223,7 +223,7 @@
223223
[style.min-height.px]="cellHeight"
224224
[rowData]="rowData"
225225
[visibleColumnIndex]="col.visibleIndex"
226-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
226+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
227227
[cellTemplate]="col.bodyTemplate"
228228
[lastSearchInfo]="grid.lastSearchInfo"
229229
[active]="isCellActive(col.visibleIndex)"

‎projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-row.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
[style.flex-basis]="col.width"
7171
[width]="col.getCellWidth()"
7272
[visibleColumnIndex]="col.visibleIndex"
73-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
73+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
7474
[cellTemplate]="col.bodyTemplate"
7575
[lastSearchInfo]="grid.lastSearchInfo"
7676
[cellSelectionMode]="grid.cellSelection"
@@ -119,7 +119,7 @@
119119
[style.left]="col.rightPinnedOffset"
120120
[width]="col.getCellWidth()"
121121
[visibleColumnIndex]="col.visibleIndex"
122-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
122+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
123123
[cellTemplate]="col.bodyTemplate"
124124
[lastSearchInfo]="grid.lastSearchInfo"
125125
[cellSelectionMode]="grid.cellSelection"

‎projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-row.component.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
[style.flex-basis]="col.width"
4444
[width]="col.getCellWidth()"
4545
[visibleColumnIndex]="col.visibleIndex"
46-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
46+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
4747
[cellTemplate]="col.bodyTemplate"
4848
[lastSearchInfo]="grid.lastSearchInfo"
4949
[active]="isCellActive(col.visibleIndex)"
@@ -74,7 +74,7 @@
7474
[style.flex-basis]="col.width"
7575
[width]="col.getCellWidth()"
7676
[visibleColumnIndex]="col.visibleIndex"
77-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
77+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
7878
[isLoading]="isLoading"
7979
[cellTemplate]="col.bodyTemplate"
8080
[lastSearchInfo]="grid.lastSearchInfo"
@@ -127,7 +127,7 @@
127127
[style.left]="col.rightPinnedOffset"
128128
[width]="col.getCellWidth()"
129129
[visibleColumnIndex]="col.visibleIndex"
130-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
130+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
131131
[cellTemplate]="col.bodyTemplate"
132132
[lastSearchInfo]="grid.lastSearchInfo"
133133
[active]="isCellActive(col.visibleIndex)"
@@ -160,7 +160,7 @@
160160
[style.left]="col.rightPinnedOffset"
161161
[width]="col.getCellWidth()"
162162
[visibleColumnIndex]="col.visibleIndex"
163-
[value]="rowData | dataMapper:col.field:grid.pipeTrigger"
163+
[value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]"
164164
[isLoading]="isLoading"
165165
[cellTemplate]="col.bodyTemplate"
166166
[lastSearchInfo]="grid.lastSearchInfo"
@@ -173,4 +173,3 @@
173173
<ng-container *ngTemplateOutlet="col.visibleIndex === 0 ? treeCellTemplate : cellTemplate"></ng-container>
174174
</ng-template>
175175
</ng-template>
176-
</ng-template>

‎projects/igniteui-angular/src/lib/services/csv/csv-exporter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { CsvFileTypes, IgxCsvExporterOptions } from './csv-exporter-options';
66
import { IBaseEventArgs } from '../../core/utils';
77

88
export interface ICsvExportEndedEventArgs extends IBaseEventArgs {
9-
csvData: string;
9+
csvData?: string;
1010
}
1111

1212
/**

‎projects/igniteui-angular/src/lib/services/excel/excel-exporter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { IBaseEventArgs } from '../../core/utils';
1212
import { WorksheetFile } from './excel-files';
1313

1414
export interface IExcelExportEndedEventArgs extends IBaseEventArgs {
15-
xlsx: JSZip;
15+
xlsx?: JSZip;
1616
}
1717

1818
/**

‎projects/igniteui-angular/src/lib/splitter/splitter-bar/splitter-bar.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[dragDirection]='dragDir'
77
(dragStart)='onDragStart($event)'
88
(dragMove)="onDragMove($event)"
9+
(dragEnd)="onDragEnd($event)"
910
>
1011
<div class="igx-splitter-bar__expander--start" igxDragIgnore (click)='onCollapsing(false)' [hidden]='prevButtonHidden'></div>
1112
<div class="igx-splitter-bar__handle" ></div>

‎projects/igniteui-angular/src/lib/splitter/splitter-bar/splitter-bar.component.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ export class IgxSplitBarComponent {
8888
@Output()
8989
public moving = new EventEmitter<number>();
9090

91+
@Output()
92+
public movingEnd = new EventEmitter<number>();
93+
9194
/**
9295
* A temporary holder for the pointer coordinates.
9396
*/
@@ -213,6 +216,15 @@ export class IgxSplitBarComponent {
213216
}
214217
}
215218

219+
public onDragEnd(event: any) {
220+
const isHorizontal = this.type === SplitterType.Horizontal;
221+
const curr = isHorizontal ? event.pageX : event.pageY;
222+
const delta = this.startPoint - curr;
223+
if (delta !== 0) {
224+
this.movingEnd.emit(delta);
225+
}
226+
}
227+
216228
protected get resizeDisallowed() {
217229
const relatedTabs = this.siblings;
218230
return !!relatedTabs.find(x => x.resizable === false || x.collapsed === true);

‎projects/igniteui-angular/src/lib/splitter/splitter-pane/splitter-pane.component.ts‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { Component, HostBinding, Input, ElementRef, Output, EventEmitter } from
2020
export class IgxSplitterPaneComponent {
2121

2222
private _size = 'auto';
23+
private _dragSize;
2324
private _collapsed = false;
2425

2526
/** @hidden @internal */
@@ -44,6 +45,20 @@ export class IgxSplitterPaneComponent {
4445
this.el.nativeElement.style.flex = this.flex;
4546
}
4647

48+
/** @hidden @internal */
49+
get isPercentageSize() {
50+
return this.size === 'auto' || this.size.indexOf('%') !== -1;
51+
}
52+
53+
/** @hidden @internal */
54+
get dragSize() {
55+
return this._dragSize;
56+
}
57+
set dragSize(val) {
58+
this._dragSize = val;
59+
this.el.nativeElement.style.flex = this.flex;
60+
}
61+
4762
/**
4863
* Gets/Sets the minimum allowed size of the current pane.
4964
* @example
@@ -137,10 +152,10 @@ export class IgxSplitterPaneComponent {
137152
*/
138153
@HostBinding('style.flex')
139154
public get flex() {
140-
const grow = this.size !== 'auto' ? 0 : 1;
141-
const shrink = this.size !== 'auto' ? 0 : 1;
142-
143-
return `${grow} ${shrink} ${this.size}`;
155+
const isAuto = this.size === 'auto' && !this.dragSize;
156+
const grow = !isAuto ? 0 : 1;
157+
const size = this.dragSize || this.size;
158+
return `${grow} ${grow} ${size}`;
144159
}
145160

146161
/**

0 commit comments

Comments
 (0)