Skip to content

Commit a6fc511

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Generate elements config.
1 parent ce0c854 commit a6fc511

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

projects/igniteui-angular-elements/src/analyzer/elements.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ export var registerConfig = [
9595
],
9696
numericProps: ["rowEnd", "colEnd", "rowStart", "colStart"],
9797
boolProps: [
98+
"merge",
9899
"sortable",
99100
"selectable",
100101
"groupable",
@@ -158,6 +159,7 @@ export var registerConfig = [
158159
"expanded",
159160
"searchable",
160161
"hidden",
162+
"merge",
161163
"sortable",
162164
"groupable",
163165
"editable",
@@ -213,6 +215,7 @@ export var registerConfig = [
213215
"collapsible",
214216
"expanded",
215217
"searchable",
218+
"merge",
216219
"sortable",
217220
"groupable",
218221
"editable",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3695,7 +3695,7 @@ export abstract class IgxGridBaseDirective implements GridType,
36953695
return rec?.cellMergeMeta;
36963696
}
36973697

3698-
public getMergeCellOffset(rowData) {
3698+
protected getMergeCellOffset(rowData) {
36993699
const index = rowData.index;
37003700
let offset = this.verticalScrollContainer.scrollPosition - this.verticalScrollContainer.getScrollForIndex(index);
37013701
if (this.hasPinnedRecords && this.isRowPinningToTop) {
@@ -3971,6 +3971,10 @@ export abstract class IgxGridBaseDirective implements GridType,
39713971
}
39723972
}
39733973

3974+
/**
3975+
* @hidden
3976+
* @internal
3977+
*/
39743978
public get columnsToMerge() : ColumnType[] {
39753979
return this.visibleColumns.filter(
39763980
x => x.merge && (this.cellMergeMode ==='always' ||

0 commit comments

Comments
 (0)