Skip to content

Commit 3584329

Browse files
kdinevkdinev
authored
Merge branch 'master' into skrastev/fix-12413-master
2 parents 9355efd + c283c0f commit 3584329

File tree

11 files changed

+69
-32
lines changed

11 files changed

+69
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ All notable changes for each version of this project will be documented in this
1818
* - `IgxColumnComponent` - `ColumnType` (for example the column parameter in `igxFilterCellTemplate`)
1919
* - `IgxGridCell` - `CellType` (for example the cell parameter in `igxCell` template)
2020

21+
- A new `groupRecord` parameter has been exposed in `operate` method, that is an `IGroupByRecord` object describing the grouped row in case grouping is applied.
22+
2123
- `excelStyleHeaderIconTemplate` - Gets/Sets the excel style header icon.
2224
- `groupRowTemplate` - Gets/Sets the template reference for the group row.
2325
- `headSelectorTemplate` - Gets/Sets the header row selector template.

‎projects/igniteui-angular/src/lib/chips/chips-area.component.ts‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {
1+
import {
22
Component,
33
ContentChildren,
44
ChangeDetectorRef,
@@ -24,6 +24,7 @@ import {
2424
import { IDropBaseEventArgs, IDragBaseEventArgs } from '../directives/drag-drop/drag-drop.directive';
2525
import { takeUntil } from 'rxjs/operators';
2626
import { Subject } from 'rxjs';
27+
import { rem } from '../core/utils';
2728

2829
export interface IBaseChipsAreaEventArgs {
2930
originalEvent: IDragBaseEventArgs | IDropBaseEventArgs | KeyboardEvent | MouseEvent | TouchEvent;
@@ -112,25 +113,35 @@ export class IgxChipsAreaComponent implements DoCheck, AfterViewInit, OnDestroy
112113
*
113114
* @example
114115
* ```html
115-
* <igx-chips-area #chipsArea [width]="'300'" [height]="'10'" (onReorder)="chipsOrderChanged($event)"></igx-chips-area>
116+
* <igx-chips-area #chipsArea [width]="300" [height]="10" (onReorder)="chipsOrderChanged($event)"></igx-chips-area>
116117
* ```
117118
*/
118-
@HostBinding('style.width.px')
119119
@Input()
120120
public width: number;
121121

122+
/** @hidden @internal */
123+
@HostBinding('style.width.rem')
124+
public get _widthToRem() {
125+
return rem(this.width);
126+
}
127+
122128
/**
123129
* An @Input property that sets the height of the `IgxChipsAreaComponent`.
124130
*
125131
* @example
126132
* ```html
127-
* <igx-chips-area #chipsArea [width]="'300'" [height]="'10'" (onReorder)="chipsOrderChanged($event)"></igx-chips-area>
133+
* <igx-chips-area #chipsArea [width]="300" [height]="10" (onReorder)="chipsOrderChanged($event)"></igx-chips-area>
128134
* ```
129135
*/
130-
@HostBinding('style.height.px')
131136
@Input()
132137
public height: number;
133138

139+
/** @hidden @internal */
140+
@HostBinding('style.height.rem')
141+
public get _heightToRem() {
142+
return rem(this.height);
143+
}
144+
134145
/**
135146
* Emits an event when `IgxChipComponent`s in the `IgxChipsAreaComponent` should be reordered.
136147
* Returns an array of `IgxChipComponent`s.

‎projects/igniteui-angular/src/lib/combo/combo-item.component.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { IgxDropDownItemComponent } from '../drop-down/drop-down-item.component'
99
import { IGX_DROPDOWN_BASE, IDropDownBase, Navigate } from '../drop-down/drop-down.common';
1010
import { IgxComboAPIService } from './combo.api';
1111
import { IgxSelectionAPIService } from '../core/selection';
12+
import { rem } from '../core/utils';
1213

1314
/** @hidden */
1415
@Component({
@@ -23,9 +24,14 @@ export class IgxComboItemComponent extends IgxDropDownItemComponent {
2324
* @hidden
2425
*/
2526
@Input()
26-
@HostBinding('style.height.px')
2727
public itemHeight: string | number = '';
2828

29+
/** @hidden @internal */
30+
@HostBinding('style.height.rem')
31+
public get _itemHeightToRem() {
32+
return rem(this.itemHeight);
33+
}
34+
2935
@HostBinding('attr.aria-label')
3036
@Input()
3137
public get ariaLabel(): string {

‎projects/igniteui-angular/src/lib/combo/combo.common.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { noop, Subject } from 'rxjs';
2626
import { takeUntil } from 'rxjs/operators';
2727
import { DisplayDensityBase, DisplayDensityToken, IDisplayDensityOptions } from '../core/displayDensity';
2828
import { IgxSelectionAPIService } from '../core/selection';
29-
import { CancelableBrowserEventArgs, cloneArray, IBaseCancelableBrowserEventArgs, IBaseEventArgs, isNaNvalue } from '../core/utils';
29+
import { CancelableBrowserEventArgs, cloneArray, IBaseCancelableBrowserEventArgs, IBaseEventArgs, isNaNvalue, rem } from '../core/utils';
3030
import { SortingDirection } from '../data-operations/sorting-strategy';
3131
import { IForOfState, IgxForOfDirective } from '../directives/for-of/for_of.directive';
3232
import { IgxIconService } from '../icon/public_api';
@@ -237,6 +237,11 @@ export abstract class IgxComboBaseDirective extends DisplayDensityBase implement
237237
this._itemsMaxHeight = val;
238238
}
239239

240+
/** @hidden */
241+
public get itemsMaxHeightInRem() {
242+
return rem(this.itemsMaxHeight);
243+
}
244+
240245
/**
241246
* Configures the drop down list item height
242247
*

‎projects/igniteui-angular/src/lib/combo/combo.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<ng-container *ngTemplateOutlet="headerTemplate">
5454
</ng-container>
5555
<div #dropdownItemContainer class="igx-combo__content" [style.overflow]="'hidden'"
56-
[style.maxHeight.px]="itemsMaxHeight" [igxDropDownItemNavigation]="dropdown" (focus)="dropdown.onFocus()"
56+
[style.maxHeight.rem]="itemsMaxHeightInRem" [igxDropDownItemNavigation]="dropdown" (focus)="dropdown.onFocus()"
5757
[tabindex]="dropdown.collapsed ? -1 : 0" [attr.id]="dropdown.id" aria-multiselectable="true"
5858
[attr.aria-activedescendant]="this.activeDescendant">
5959
<igx-combo-item [itemHeight]='itemHeight' *igxFor="let item of data

‎projects/igniteui-angular/src/lib/core/utils.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,3 +788,9 @@ export const formatDate = (value: string | number | Date, format: string, locale
788788
};
789789

790790
export const formatCurrency = new CurrencyPipe(undefined).transform;
791+
792+
/** Converts pixel values to their rem counterparts for a base value */
793+
export const rem = (value: number | string) => {
794+
const base = parseFloat(getComputedStyle(document.documentElement).getPropertyValue('font-size'))
795+
return Number(value) / base;
796+
}

‎projects/igniteui-angular/src/lib/grids/grid-base.directive.ts‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7235,35 +7235,32 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
72357235
const expansionRowIndexes = [];
72367236
for (const [key, value] of this.expansionStates.entries()) {
72377237
if (value) {
7238-
expansionRowIndexes.push(key);
7238+
const rowIndex = this.gridAPI.get_rec_index_by_id(key, this.dataView);
7239+
expansionRowIndexes.push(rowIndex);
72397240
}
72407241
}
72417242
if (this.selectionService.selection.size > 0) {
72427243
if (expansionRowIndexes.length > 0) {
72437244
for (const [key, value] of this.selectionService.selection.entries()) {
72447245
let updatedKey = key;
7245-
expansionRowIndexes.forEach(row => {
7246-
let rowIndex;
7247-
if (!isNaN(row.ID)) {
7248-
rowIndex = Number(row.ID);
7249-
} else {
7250-
rowIndex = Number(row);
7251-
}
7252-
7253-
if (updatedKey > Number(rowIndex)) {
7254-
updatedKey--;
7246+
let subtract = 0;
7247+
expansionRowIndexes.forEach((row) => {
7248+
if (updatedKey > Number(row)) {
7249+
subtract++;
72557250
}
72567251
});
7257-
selectionCollection.set(updatedKey, value);
7252+
selectionCollection.set(updatedKey - subtract, value);
72587253
}
72597254
}
72607255
} else if (activeEl) {
7256+
let subtract = 0;
72617257
if (expansionRowIndexes.length > 0) {
72627258
expansionRowIndexes.forEach(row => {
72637259
if (activeEl.row > Number(row)) {
7264-
activeEl.row--;
7260+
subtract++;
72657261
}
72667262
});
7263+
activeEl.row -= subtract;
72677264
}
72687265
}
72697266
}

‎projects/igniteui-angular/src/lib/grids/summaries/grid-summary.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class IgxSummaryOperand {
6161
* constructor() {
6262
* super();
6363
* }
64-
* public operate(data: any[], allData: any[], fieldName: string): IgxSummaryResult[] {
64+
* public operate(data: any[], allData: any[], fieldName: string, groupRecord: IGroupByRecord): IgxSummaryResult[] {
6565
* const result = [];
6666
* result.push({
6767
* key: "test",
@@ -151,8 +151,8 @@ export class IgxNumberSummaryOperand extends IgxSummaryOperand {
151151
* constructor() {
152152
* super();
153153
* }
154-
* public operate(data: any[], allData: any[], fieldName: string): IgxSummaryResult[] {
155-
* const result = super.operate(data, allData, fieldName);
154+
* public operate(data: any[], allData: any[], fieldName: string, groupRecord: IGroupByRecord): IgxSummaryResult[] {
155+
* const result = super.operate(data, allData, fieldName, groupRecord);
156156
* result.push({
157157
* key: "avg",
158158
* label: "Avg",
@@ -244,8 +244,8 @@ export class IgxDateSummaryOperand extends IgxSummaryOperand {
244244
* constructor() {
245245
* super();
246246
* }
247-
* public operate(data: any[], allData: any[], fieldName: string): IgxSummaryResult[] {
248-
* const result = super.operate(data, allData, fieldName);
247+
* public operate(data: any[], allData: any[], fieldName: string, groupRecord: IGroupByRecord): IgxSummaryResult[] {
248+
* const result = super.operate(data, allData, fieldName, groupRecord);
249249
* result.push({
250250
* key: "deadline",
251251
* label: "Deadline Date",

‎projects/igniteui-angular/src/lib/list/list-item.component.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
1+
22
<div *ngIf="!isHeader && list.listItemLeftPanningTemplate" #leftPanningTmpl class="igx-list__item-right"
3-
[style.width.px]="this.element.offsetWidth" [style.height.px]="this.element.offsetHeight">
4-
<ng-container *ngTemplateOutlet="list.listItemLeftPanningTemplate.template; context: context">
3+
[style.width.rem]="offsetWidthInRem" [style.height.rem]="offsetHeightInRem">
4+
<ng-container *ngTemlateOutlet="list.listItemLeftPanningTemplate.template; context: context">
55
</ng-container>
66
</div>
77

88
<div *ngIf="!isHeader && list.listItemRightPanningTemplate" #rightPanningTmpl class="igx-list__item-left"
9-
[style.width.px]="this.element.offsetWidth" [style.height.px]="this.element.offsetHeight">
9+
[style.width.rem]="offsetWidthInRem" [style.height.rem]="offsetHeightInRem">
1010
<ng-container *ngTemplateOutlet="list.listItemRightPanningTemplate.template; context: context">
1111
</ng-container>
1212
</div>
@@ -33,7 +33,6 @@
3333
</div>
3434
</ng-template>
3535

36-
3736
<ng-container *ngIf="isHeader">
3837
<ng-container *ngTemplateOutlet="itemsContent"></ng-container>
3938
</ng-container>

‎projects/igniteui-angular/src/lib/list/list-item.component.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
} from './list.common';
1717

1818
import { HammerGesturesManager } from '../core/touch';
19+
import { rem } from '../core/utils';
1920

2021
/**
2122
* The Ignite UI List Item component is a container intended for row items in the Ignite UI for Angular List component.
@@ -241,6 +242,16 @@ export class IgxListItemComponent implements IListChild {
241242
return this.width;
242243
}
243244

245+
/** @hidden @internal */
246+
public get offsetWidthInRem() {
247+
return rem(this.element.offsetWidth);
248+
}
249+
250+
/** @hidden @internal */
251+
public get offsetHeightInRem() {
252+
return rem(this.element.offsetHeight);
253+
}
254+
244255
constructor(
245256
public list: IgxListBaseDirective,
246257
private elementRef: ElementRef,

0 commit comments

Comments
 (0)