diff --git a/package.json b/package.json index 31e1a26b1..2b48d49fb 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "jquery-ui-dist": "^1.12.1", "lodash.isequal": "^4.5.0", "moment-mini": "^2.24.0", - "slickgrid": "^2.4.29", + "slickgrid": "^2.4.30", "text-encoding-utf-8": "^1.0.2" }, "devDependencies": { diff --git a/src/aurelia-slickgrid/extensions/__tests__/gridMenuExtension.spec.ts b/src/aurelia-slickgrid/extensions/__tests__/gridMenuExtension.spec.ts index ec3bdaf30..1eec4b112 100644 --- a/src/aurelia-slickgrid/extensions/__tests__/gridMenuExtension.spec.ts +++ b/src/aurelia-slickgrid/extensions/__tests__/gridMenuExtension.spec.ts @@ -615,7 +615,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/aurelia-slickgrid/extensions/__tests__/headerMenuExtension.spec.ts b/src/aurelia-slickgrid/extensions/__tests__/headerMenuExtension.spec.ts index adaf6217c..f5f789e66 100644 --- a/src/aurelia-slickgrid/extensions/__tests__/headerMenuExtension.spec.ts +++ b/src/aurelia-slickgrid/extensions/__tests__/headerMenuExtension.spec.ts @@ -424,7 +424,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(); }); @@ -437,7 +437,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/aurelia-slickgrid/extensions/gridMenuExtension.ts b/src/aurelia-slickgrid/extensions/gridMenuExtension.ts index a5dd385c4..8ebd01999 100644 --- a/src/aurelia-slickgrid/extensions/gridMenuExtension.ts +++ b/src/aurelia-slickgrid/extensions/gridMenuExtension.ts @@ -387,8 +387,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/aurelia-slickgrid/extensions/headerMenuExtension.ts b/src/aurelia-slickgrid/extensions/headerMenuExtension.ts index 945319c14..0cc7520c7 100644 --- a/src/aurelia-slickgrid/extensions/headerMenuExtension.ts +++ b/src/aurelia-slickgrid/extensions/headerMenuExtension.ts @@ -346,7 +346,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 } as GridOption); + 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 diff --git a/src/examples/slickgrid/example14.ts b/src/examples/slickgrid/example14.ts index 960626030..590e5a899 100644 --- a/src/examples/slickgrid/example14.ts +++ b/src/examples/slickgrid/example14.ts @@ -74,7 +74,6 @@ export class Example14 { ]; 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, @@ -106,7 +105,7 @@ export class Example14 { } setFrozenColumns2(frozenCols: number) { - this.gridObj2.setOptions({ frozenColumn: frozenCols, alwaysShowVerticalScroll: false }); + this.gridObj2.setOptions({ frozenColumn: frozenCols }); this.gridOptions2 = this.gridObj2.getOptions(); } diff --git a/src/examples/slickgrid/example20.ts b/src/examples/slickgrid/example20.ts index 7755e867d..f54e9958c 100644 --- a/src/examples/slickgrid/example20.ts +++ b/src/examples/slickgrid/example20.ts @@ -203,7 +203,6 @@ export class Example20 { containerId: 'demo-container', sidePadding: 10 }, - alwaysShowVerticalScroll: false, // disable scroll since we don't want it to show on the left pinned columns enableCellNavigation: true, editable: true, autoEdit: true, @@ -276,7 +275,7 @@ export class Example20 { } setFrozenColumns(frozenCols: number) { - this.gridObj.setOptions({ frozenColumn: frozenCols, alwaysShowVerticalScroll: false }); + this.gridObj.setOptions({ frozenColumn: frozenCols }); this.gridOptions = this.gridObj.getOptions(); } diff --git a/src/examples/slickgrid/example25.ts b/src/examples/slickgrid/example25.ts index c2f5593a1..cbba237c3 100644 --- a/src/examples/slickgrid/example25.ts +++ b/src/examples/slickgrid/example25.ts @@ -35,16 +35,16 @@ export interface Country { export class Example25 { title = 'Example 25: GraphQL Basic API without Pagination'; subTitle = ` - Use it as a basic GraphQL API with any external public APIs (Wiki docs). + Use basic GraphQL query with any external public APIs (Wiki docs). `;