diff --git a/src/app/examples/grid-colspan.component.ts b/src/app/examples/grid-colspan.component.ts index b145b6270..dc0503017 100644 --- a/src/app/examples/grid-colspan.component.ts +++ b/src/app/examples/grid-colspan.component.ts @@ -78,7 +78,6 @@ export class GridColspanComponent implements OnInit { ]; this.gridOptions2 = { - alwaysShowVerticalScroll: false, // disable scroll since we don't want it to show on the left pinned columns enableCellNavigation: true, enableColumnReorder: false, createPreHeaderPanel: true, @@ -112,7 +111,7 @@ export class GridColspanComponent implements OnInit { } setFrozenColumns2(frozenCols: number) { - this.gridObj2.setOptions({ frozenColumn: frozenCols, alwaysShowVerticalScroll: false }); + this.gridObj2.setOptions({ frozenColumn: frozenCols }); this.gridOptions2 = this.gridObj2.getOptions(); } diff --git a/src/app/examples/grid-frozen.component.ts b/src/app/examples/grid-frozen.component.ts index 7d763d96b..a89a5acef 100644 --- a/src/app/examples/grid-frozen.component.ts +++ b/src/app/examples/grid-frozen.component.ts @@ -200,7 +200,6 @@ export class GridFrozenComponent implements OnInit { containerId: 'demo-container', sidePadding: 10 }, - alwaysShowVerticalScroll: false, // disable scroll since we don't want it to show on the left pinned columns enableExcelCopyBuffer: true, enableCellNavigation: true, editable: true, @@ -276,7 +275,7 @@ export class GridFrozenComponent implements OnInit { } setFrozenColumns(frozenCols: number) { - this.gridObj.setOptions({ frozenColumn: frozenCols, alwaysShowVerticalScroll: false }); + this.gridObj.setOptions({ frozenColumn: frozenCols }); this.gridOptions = this.gridObj.getOptions(); } diff --git a/src/app/modules/angular-slickgrid/extensions/__tests__/gridMenuExtension.spec.ts b/src/app/modules/angular-slickgrid/extensions/__tests__/gridMenuExtension.spec.ts index af6b7798c..945f919bb 100644 --- a/src/app/modules/angular-slickgrid/extensions/__tests__/gridMenuExtension.spec.ts +++ b/src/app/modules/angular-slickgrid/extensions/__tests__/gridMenuExtension.spec.ts @@ -607,7 +607,7 @@ describe('gridMenuExtension', () => { expect(onCommandSpy).toHaveBeenCalled(); expect(setColumnsSpy).toHaveBeenCalled(); - expect(setOptionsSpy).toHaveBeenCalledWith({ frozenColumn: -1, alwaysShowVerticalScroll: true }); + expect(setOptionsSpy).toHaveBeenCalledWith({ frozenColumn: -1 }); }); it('should call "clearFilters" and dataview refresh when the command triggered is "clear-filter"', () => { diff --git a/src/app/modules/angular-slickgrid/extensions/__tests__/headerMenuExtension.spec.ts b/src/app/modules/angular-slickgrid/extensions/__tests__/headerMenuExtension.spec.ts index 8e370405d..1e33e54a7 100644 --- a/src/app/modules/angular-slickgrid/extensions/__tests__/headerMenuExtension.spec.ts +++ b/src/app/modules/angular-slickgrid/extensions/__tests__/headerMenuExtension.spec.ts @@ -416,7 +416,7 @@ describe('headerMenuExtension', () => { instance.onCommand.notify({ column: columnsMock[0], grid: gridStub, command: 'freeze-columns' }, new Slick.EventData(), gridStub); expect(onCommandSpy).toHaveBeenCalled(); - expect(setOptionsSpy).toHaveBeenCalledWith({ frozenColumn: 0, alwaysShowVerticalScroll: false }); + expect(setOptionsSpy).toHaveBeenCalledWith({ frozenColumn: 0 }); expect(setColumnsSpy).toHaveBeenCalled(); }); @@ -429,7 +429,7 @@ describe('headerMenuExtension', () => { instance.onCommand.notify({ column: columnsMock[1], grid: gridStub, command: 'freeze-columns' }, new Slick.EventData(), gridStub); expect(onCommandSpy).toHaveBeenCalled(); - expect(setOptionsSpy).toHaveBeenCalledWith({ frozenColumn: -1, alwaysShowVerticalScroll: false }); + expect(setOptionsSpy).toHaveBeenCalledWith({ frozenColumn: -1 }); expect(setColumnsSpy).toHaveBeenCalled(); }); diff --git a/src/app/modules/angular-slickgrid/extensions/gridMenuExtension.ts b/src/app/modules/angular-slickgrid/extensions/gridMenuExtension.ts index badd89ca8..a474a659b 100644 --- a/src/app/modules/angular-slickgrid/extensions/gridMenuExtension.ts +++ b/src/app/modules/angular-slickgrid/extensions/gridMenuExtension.ts @@ -370,8 +370,7 @@ export class GridMenuExtension implements Extension { switch (args.command) { case 'clear-frozen-columns': const visibleColumns = [...this.sharedService.visibleColumns]; - const showVerticalScroll = this.sharedService.gridOptions && this.sharedService.gridOptions.enableGridMenu || false; - this.sharedService.grid.setOptions({ frozenColumn: -1, alwaysShowVerticalScroll: showVerticalScroll }); + this.sharedService.grid.setOptions({ frozenColumn: -1 }); if (Array.isArray(visibleColumns) && Array.isArray(this.sharedService.allColumns) && visibleColumns.length !== this.sharedService.allColumns.length) { this.sharedService.grid.setColumns(visibleColumns); } diff --git a/src/app/modules/angular-slickgrid/extensions/headerMenuExtension.ts b/src/app/modules/angular-slickgrid/extensions/headerMenuExtension.ts index 6167eeab4..422bcdefd 100644 --- a/src/app/modules/angular-slickgrid/extensions/headerMenuExtension.ts +++ b/src/app/modules/angular-slickgrid/extensions/headerMenuExtension.ts @@ -329,7 +329,7 @@ export class HeaderMenuExtension implements Extension { case 'freeze-columns': const visibleColumns = [...this.sharedService.visibleColumns]; const columnPosition = visibleColumns.findIndex((col) => col.id === args.column.id); - this.sharedService.grid.setOptions({ frozenColumn: columnPosition, alwaysShowVerticalScroll: false }); + this.sharedService.grid.setOptions({ frozenColumn: columnPosition } as GridOption); // to freeze columns, we need to take only the visible columns and we also need to use setColumns() when some of them are hidden // to make sure that we only use the visible columns, not doing this would show back some of the hidden columns