Skip to content
This repository was archived by the owner on Mar 16, 2021. It is now read-only.

Commit 6c66eab

Browse files
committed
Merge branch 'release/6.0.0' into master
2 parents 33d1f1f + 49ef604 commit 6c66eab

File tree

7 files changed

+3987
-5547
lines changed

7 files changed

+3987
-5547
lines changed

package-lock.json

Lines changed: 3955 additions & 5517 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@handsontable/angular",
3-
"version": "5.1.1",
3+
"version": "6.0.0",
44
"description": "Best Data Grid for Angular with Spreadsheet Look and Feel.",
55
"author": "Handsoncode <hello@handsoncode.net> (https://handsoncode.net)",
66
"license": "MIT",
@@ -50,28 +50,28 @@
5050
"release": "npm run test && npm publish dist/hot-table --access public"
5151
},
5252
"peerDependencies": {
53-
"handsontable": "^7.0.0"
53+
"handsontable": "^8.0.0"
5454
},
5555
"dependencies": {
56-
"@angular/animations": "~8.0.0",
57-
"@angular/common": "~8.0.0",
58-
"@angular/compiler": "~8.0.0",
59-
"@angular/core": "~8.0.0",
60-
"@angular/forms": "~8.0.0",
61-
"@angular/platform-browser": "~8.0.0",
62-
"@angular/platform-browser-dynamic": "~8.0.0",
63-
"@angular/router": "~8.0.0",
56+
"@angular/animations": "^8.0.0",
57+
"@angular/common": "^8.0.0",
58+
"@angular/compiler": "^8.0.0",
59+
"@angular/core": "^8.0.0",
60+
"@angular/forms": "^8.0.0",
61+
"@angular/platform-browser": "^8.0.0",
62+
"@angular/platform-browser-dynamic": "^8.0.0",
63+
"@angular/router": "^8.0.0",
6464
"core-js": "^2.5.4",
65-
"handsontable": "^7.0.0",
65+
"handsontable": "^8.0.0",
6666
"rxjs": "~6.5.2",
6767
"zone.js": "~0.9.1"
6868
},
6969
"devDependencies": {
7070
"@angular-devkit/build-angular": "~0.803",
7171
"@angular-devkit/build-ng-packagr": "~0.800.0",
72-
"@angular/cli": "~8.0.1",
73-
"@angular/compiler-cli": "~8.0.0",
74-
"@angular/language-service": "~8.0.0",
72+
"@angular/cli": "^8.0.0",
73+
"@angular/compiler-cli": "^8.0.0",
74+
"@angular/language-service": "^8.0.0",
7575
"@types/jasmine": "~3.3.9",
7676
"@types/jasminewd2": "~2.0.3",
7777
"@types/node": "^11.9.6",
@@ -84,9 +84,10 @@
8484
"karma-jasmine": "~2.0.1",
8585
"karma-jasmine-html-reporter": "^1.4.0",
8686
"ng-packagr": "^5.2.0",
87-
"protractor": "~5.4.0",
87+
"npm-registry-fetch": "4.0.5",
88+
"protractor": "^7.0.0",
8889
"ts-node": "~8.0.2",
89-
"tsickle": ">=0.29.0",
90+
"tsickle": ">=0.29.0 <= 0.37.0",
9091
"tslib": "^1.9.0",
9192
"tslint": "~5.13.0",
9293
"typescript": "3.4.5"

projects/hot-table/src/lib/hot-column.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,10 +593,10 @@ describe('HotColumnComponent', () => {
593593
{},
594594
];
595595
fixture.detectChanges();
596-
expect(app.getHotInstance(app.id).getCellMeta(0, 0)['language']).toBe(void 0);
596+
expect(app.getHotInstance(app.id).getCellMeta(0, 0)['language']).toBe('en-US');
597597
expect(app.getHotInstance(app.id).getCellMeta(0, 1)['language']).toBe('pt-BR');
598598
expect(app.getHotInstance(app.id).getCellMeta(0, 2)['language']).toBe('it-IT');
599-
expect(app.getHotInstance(app.id).getCellMeta(0, 3)['language']).toBe(void 0);
599+
expect(app.getHotInstance(app.id).getCellMeta(0, 3)['language']).toBe('en-US');
600600
});
601601
});
602602

projects/hot-table/src/lib/hot-settings-resolver.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Injectable, SimpleChanges } from '@angular/core';
22
import Handsontable from 'handsontable';
33

4-
const AVAILABLE_OPTIONS: string[] = Object.keys(Handsontable.DefaultSettings.prototype);
4+
const AVAILABLE_OPTIONS: string[] = Object.keys(Handsontable.DefaultSettings);
55
const AVAILABLE_HOOKS: string[] = Handsontable.hooks.getRegistered();
66

77
@Injectable()

projects/hot-table/src/lib/hot-table.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe('HotTableComponent', () => {
8888

8989
describe('options', () => {
9090
it('should support all of the available options in Handsontable', async() => {
91-
const options = Object.keys(Handsontable.DefaultSettings.prototype);
91+
const options = Object.keys(Handsontable.DefaultSettings);
9292
const unsupportedSettings = ['isEmptyRow', 'isEmptyCol'];
9393
const template = `<hot-table [hotId]="id" ${options.map(option => unsupportedSettings.includes(option) ?
9494
'' :

projects/hot-table/src/lib/hot-table.component.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
6666
@Input() data: Handsontable.GridSettings['data'];
6767
@Input() dataSchema: Handsontable.GridSettings['dataSchema'];
6868
@Input() dateFormat: Handsontable.GridSettings['dateFormat'];
69-
@Input() debug: Handsontable.GridSettings['debug'];
7069
@Input() defaultDate: Handsontable.GridSettings['defaultDate'];
7170
@Input() disableVisualSelection: Handsontable.GridSettings['disableVisualSelection'];
7271
@Input() dragToScroll: Handsontable.GridSettings['dragToScroll'];
@@ -83,7 +82,6 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
8382
@Input() fixedRowsTop: Handsontable.GridSettings['fixedRowsTop'];
8483
@Input() formulas: Handsontable.GridSettings['formulas'];
8584
@Input() fragmentSelection: Handsontable.GridSettings['fragmentSelection'];
86-
@Input() ganttChart: Handsontable.GridSettings['ganttChart'];
8785
@Input() headerTooltips: Handsontable.GridSettings['headerTooltips'];
8886
@Input() height: Handsontable.GridSettings['height'];
8987
@Input() hiddenColumns: Handsontable.GridSettings['hiddenColumns'];
@@ -116,6 +114,7 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
116114
@Input() placeholder: Handsontable.GridSettings['placeholder'];
117115
@Input() placeholderCellClassName: Handsontable.GridSettings['placeholderCellClassName'];
118116
@Input() preventOverflow: Handsontable.GridSettings['preventOverflow'];
117+
@Input() preventWheel: Handsontable.GridSettings['preventWheel'];
119118
@Input() readOnly: Handsontable.GridSettings['readOnly'];
120119
@Input() readOnlyCellClassName: Handsontable.GridSettings['readOnlyCellClassName'];
121120
@Input() renderAllRows: Handsontable.GridSettings['renderAllRows'];
@@ -152,10 +151,13 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
152151

153152
// handsontable hooks
154153
@Input() afterAddChild: Handsontable.GridSettings['afterAddChild'];
154+
@Input() afterAutofill: Handsontable.GridSettings['afterAutofill'];
155155
@Input() afterBeginEditing: Handsontable.GridSettings['afterBeginEditing'];
156156
@Input() afterCellMetaReset: Handsontable.GridSettings['afterCellMetaReset'];
157157
@Input() afterChange: Handsontable.GridSettings['afterChange'];
158158
@Input() afterChangesObserved: Handsontable.GridSettings['afterChangesObserved'];
159+
@Input() afterColumnCollapse: Handsontable.GridSettings['afterColumnCollapse'];
160+
@Input() afterColumnExpand: Handsontable.GridSettings['afterColumnExpand'];
159161
@Input() afterColumnMove: Handsontable.GridSettings['afterColumnMove'];
160162
@Input() afterColumnResize: Handsontable.GridSettings['afterColumnResize'];
161163
@Input() afterColumnSort: Handsontable.GridSettings['afterColumnSort'];
@@ -218,6 +220,7 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
218220
@Input() afterSetCellMeta: Handsontable.GridSettings['afterSetCellMeta'];
219221
@Input() afterSetDataAtCell: Handsontable.GridSettings['afterSetDataAtCell'];
220222
@Input() afterSetDataAtRowProp: Handsontable.GridSettings['afterSetDataAtRowProp'];
223+
@Input() afterSetSourceDataAtCell: Handsontable.GridSettings['afterSetSourceDataAtCell'];
221224
@Input() afterTrimRow: Handsontable.GridSettings['afterTrimRow'];
222225
@Input() afterUndo: Handsontable.GridSettings['afterUndo'];
223226
@Input() afterUnhideColumns: Handsontable.GridSettings['afterUnhideColumns'];
@@ -235,6 +238,8 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
235238
@Input() beforeCellAlignment: Handsontable.GridSettings['beforeCellAlignment'];
236239
@Input() beforeChange: Handsontable.GridSettings['beforeChange'];
237240
@Input() beforeChangeRender: Handsontable.GridSettings['beforeChangeRender'];
241+
@Input() beforeColumnCollapse: Handsontable.GridSettings['beforeColumnCollapse'];
242+
@Input() beforeColumnExpand: Handsontable.GridSettings['beforeColumnExpand'];
238243
@Input() beforeColumnMove: Handsontable.GridSettings['beforeColumnMove'];
239244
@Input() beforeColumnResize: Handsontable.GridSettings['beforeColumnResize'];
240245
@Input() beforeColumnSort: Handsontable.GridSettings['beforeColumnSort'];
@@ -256,6 +261,7 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
256261
@Input() beforeInitWalkontable: Handsontable.GridSettings['beforeInitWalkontable'];
257262
@Input() beforeKeyDown: Handsontable.GridSettings['beforeKeyDown'];
258263
@Input() beforeLanguageChange: Handsontable.GridSettings['beforeLanguageChange'];
264+
@Input() beforeLoadData: Handsontable.GridSettings['beforeLoadData'];
259265
@Input() beforeMergeCells: Handsontable.GridSettings['beforeMergeCells'];
260266
@Input() beforeOnCellContextMenu: Handsontable.GridSettings['beforeOnCellContextMenu'];
261267
@Input() beforeOnCellMouseDown: Handsontable.GridSettings['beforeOnCellMouseDown'];
@@ -273,6 +279,7 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
273279
@Input() beforeRenderer: Handsontable.GridSettings['beforeRenderer'];
274280
@Input() beforeRowMove: Handsontable.GridSettings['beforeRowMove'];
275281
@Input() beforeRowResize: Handsontable.GridSettings['beforeRowResize'];
282+
@Input() beforeSetCellMeta: Handsontable.GridSettings['beforeSetCellMeta'];
276283
@Input() beforeSetRangeEnd: Handsontable.GridSettings['beforeSetRangeEnd'];
277284
@Input() beforeSetRangeStart: Handsontable.GridSettings['beforeSetRangeStart'];
278285
@Input() beforeSetRangeStartOnly: Handsontable.GridSettings['beforeSetRangeStartOnly'];
@@ -287,30 +294,24 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
287294
@Input() beforeValidate: Handsontable.GridSettings['beforeValidate'];
288295
@Input() beforeValueRender: Handsontable.GridSettings['beforeValueRender'];
289296
@Input() construct: Handsontable.GridSettings['construct'];
290-
@Input() hiddenColumn: Handsontable.GridSettings['hiddenColumn'];
291-
@Input() hiddenRow: Handsontable.GridSettings['hiddenRow'];
292297
@Input() init: Handsontable.GridSettings['init'];
293298
@Input() modifyAutofillRange: Handsontable.GridSettings['modifyAutofillRange'];
294-
@Input() modifyCol: Handsontable.GridSettings['modifyCol'];
295299
@Input() modifyColHeader: Handsontable.GridSettings['modifyColHeader'];
296300
@Input() modifyColumnHeaderHeight: Handsontable.GridSettings['modifyColumnHeaderHeight'];
297301
@Input() modifyColWidth: Handsontable.GridSettings['modifyColWidth'];
298302
@Input() modifyCopyableRange: Handsontable.GridSettings['modifyCopyableRange'];
299303
@Input() modifyData: Handsontable.GridSettings['modifyData'];
300304
@Input() modifyGetCellCoords: Handsontable.GridSettings['modifyGetCellCoords'];
301-
@Input() modifyRow: Handsontable.GridSettings['modifyRow'];
302305
@Input() modifyRowData: Handsontable.GridSettings['modifyRowData'];
303306
@Input() modifyRowHeader: Handsontable.GridSettings['modifyRowHeader'];
304307
@Input() modifyRowHeaderWidth: Handsontable.GridSettings['modifyRowHeaderWidth'];
305308
@Input() modifyRowHeight: Handsontable.GridSettings['modifyRowHeight'];
309+
@Input() modifySourceData: Handsontable.GridSettings['modifySourceData'];
306310
@Input() modifyTransformEnd: Handsontable.GridSettings['modifyTransformEnd'];
307311
@Input() modifyTransformStart: Handsontable.GridSettings['modifyTransformStart'];
308312
@Input() persistentStateLoad: Handsontable.GridSettings['persistentStateLoad'];
309313
@Input() persistentStateReset: Handsontable.GridSettings['persistentStateReset'];
310314
@Input() persistentStateSave: Handsontable.GridSettings['persistentStateSave'];
311-
@Input() skipLengthCache: Handsontable.GridSettings['skipLengthCache'];
312-
@Input() unmodifyCol: Handsontable.GridSettings['unmodifyCol'];
313-
@Input() unmodifyRow: Handsontable.GridSettings['unmodifyRow'];
314315

315316
constructor(
316317
private _ngZone: NgZone,

projects/hot-table/src/lib/hot-table.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Version {
2424
]
2525
})
2626
export class HotTableModule extends Version {
27-
public static forRoot(): ModuleWithProviders {
27+
public static forRoot(): ModuleWithProviders<HotTableModule> {
2828
return {
2929
ngModule: HotTableModule,
3030
providers: [ HotTableRegisterer ],

0 commit comments

Comments
 (0)