Skip to content

Commit

Permalink
Merge pull request #3426 from IgniteUI/vnext
Browse files Browse the repository at this point in the history
deploy latest changes on production
  • Loading branch information
zdrawku authored Dec 15, 2023
2 parents bd73c24 + cf226bc commit 9a73605
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions live-editing/configs/GridConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1071,9 +1071,9 @@ export class GridConfigGenerator implements IConfigGenerator {
component: 'GridCollapsibleColumnGroupsComponent',
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/invoiceData.ts'],
appModuleConfig: new AppModuleConfig({
imports: ['GridCollapsibleColumnGroupsComponent', 'IgxGridModule', 'IgxTooltipModule', 'IgxPreventDocumentScrollModule'],
imports: ['GridCollapsibleColumnGroupsComponent', 'IgxGridModule', 'IgxTooltipModule', 'IgxPreventDocumentScrollModule', 'IgxIconModule'],
ngDeclarations: ['GridCollapsibleColumnGroupsComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxTooltipModule']
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxTooltipModule', 'IgxIconModule']
})
}));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export class GridExcelStyleEditingComponent implements OnInit {
public grid: IgxGridComponent;

public data: any[];
public shouldAppendValue = false;

public ngOnInit(): void {
this.data = DATA;
Expand All @@ -37,10 +38,15 @@ export class GridExcelStyleEditingComponent implements OnInit {

const columnName = grid.getColumnByVisibleIndex(activeElem.column).field;
const cell = grid.getCellByColumn(activeElem.row, columnName);
if (cell && !grid.crudService.cellInEditMode) {
grid.crudService.enterEditMode(cell);
if (cell && !cell.editMode) {
cell.editMode = true;
cell.editValue = event.key;
}
this.shouldAppendValue = true;
} else if (cell && cell.editMode && this.shouldAppendValue) {
event.preventDefault();
cell.editValue = cell.editValue + event.key;
this.shouldAppendValue = false;
}
}

if (key == 13) {
Expand Down

0 comments on commit 9a73605

Please sign in to comment.