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

Commit

Permalink
Merge branch 'release/6.0.0' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
budnix committed Aug 5, 2020
2 parents 33d1f1f + 49ef604 commit 6c66eab
Show file tree
Hide file tree
Showing 7 changed files with 3,987 additions and 5,547 deletions.
9,472 changes: 3,955 additions & 5,517 deletions package-lock.json

Large diffs are not rendered by default.

33 changes: 17 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@handsontable/angular",
"version": "5.1.1",
"version": "6.0.0",
"description": "Best Data Grid for Angular with Spreadsheet Look and Feel.",
"author": "Handsoncode <hello@handsoncode.net> (https://handsoncode.net)",
"license": "MIT",
Expand Down Expand Up @@ -50,28 +50,28 @@
"release": "npm run test && npm publish dist/hot-table --access public"
},
"peerDependencies": {
"handsontable": "^7.0.0"
"handsontable": "^8.0.0"
},
"dependencies": {
"@angular/animations": "~8.0.0",
"@angular/common": "~8.0.0",
"@angular/compiler": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/router": "~8.0.0",
"@angular/animations": "^8.0.0",
"@angular/common": "^8.0.0",
"@angular/compiler": "^8.0.0",
"@angular/core": "^8.0.0",
"@angular/forms": "^8.0.0",
"@angular/platform-browser": "^8.0.0",
"@angular/platform-browser-dynamic": "^8.0.0",
"@angular/router": "^8.0.0",
"core-js": "^2.5.4",
"handsontable": "^7.0.0",
"handsontable": "^8.0.0",
"rxjs": "~6.5.2",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803",
"@angular-devkit/build-ng-packagr": "~0.800.0",
"@angular/cli": "~8.0.1",
"@angular/compiler-cli": "~8.0.0",
"@angular/language-service": "~8.0.0",
"@angular/cli": "^8.0.0",
"@angular/compiler-cli": "^8.0.0",
"@angular/language-service": "^8.0.0",
"@types/jasmine": "~3.3.9",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^11.9.6",
Expand All @@ -84,9 +84,10 @@
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"ng-packagr": "^5.2.0",
"protractor": "~5.4.0",
"npm-registry-fetch": "4.0.5",
"protractor": "^7.0.0",
"ts-node": "~8.0.2",
"tsickle": ">=0.29.0",
"tsickle": ">=0.29.0 <= 0.37.0",
"tslib": "^1.9.0",
"tslint": "~5.13.0",
"typescript": "3.4.5"
Expand Down
4 changes: 2 additions & 2 deletions projects/hot-table/src/lib/hot-column.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,10 @@ describe('HotColumnComponent', () => {
{},
];
fixture.detectChanges();
expect(app.getHotInstance(app.id).getCellMeta(0, 0)['language']).toBe(void 0);
expect(app.getHotInstance(app.id).getCellMeta(0, 0)['language']).toBe('en-US');
expect(app.getHotInstance(app.id).getCellMeta(0, 1)['language']).toBe('pt-BR');
expect(app.getHotInstance(app.id).getCellMeta(0, 2)['language']).toBe('it-IT');
expect(app.getHotInstance(app.id).getCellMeta(0, 3)['language']).toBe(void 0);
expect(app.getHotInstance(app.id).getCellMeta(0, 3)['language']).toBe('en-US');
});
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Injectable, SimpleChanges } from '@angular/core';
import Handsontable from 'handsontable';

const AVAILABLE_OPTIONS: string[] = Object.keys(Handsontable.DefaultSettings.prototype);
const AVAILABLE_OPTIONS: string[] = Object.keys(Handsontable.DefaultSettings);
const AVAILABLE_HOOKS: string[] = Handsontable.hooks.getRegistered();

@Injectable()
Expand Down
2 changes: 1 addition & 1 deletion projects/hot-table/src/lib/hot-table.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ describe('HotTableComponent', () => {

describe('options', () => {
it('should support all of the available options in Handsontable', async() => {
const options = Object.keys(Handsontable.DefaultSettings.prototype);
const options = Object.keys(Handsontable.DefaultSettings);
const unsupportedSettings = ['isEmptyRow', 'isEmptyCol'];
const template = `<hot-table [hotId]="id" ${options.map(option => unsupportedSettings.includes(option) ?
'' :
Expand Down
19 changes: 10 additions & 9 deletions projects/hot-table/src/lib/hot-table.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
@Input() data: Handsontable.GridSettings['data'];
@Input() dataSchema: Handsontable.GridSettings['dataSchema'];
@Input() dateFormat: Handsontable.GridSettings['dateFormat'];
@Input() debug: Handsontable.GridSettings['debug'];
@Input() defaultDate: Handsontable.GridSettings['defaultDate'];
@Input() disableVisualSelection: Handsontable.GridSettings['disableVisualSelection'];
@Input() dragToScroll: Handsontable.GridSettings['dragToScroll'];
Expand All @@ -83,7 +82,6 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
@Input() fixedRowsTop: Handsontable.GridSettings['fixedRowsTop'];
@Input() formulas: Handsontable.GridSettings['formulas'];
@Input() fragmentSelection: Handsontable.GridSettings['fragmentSelection'];
@Input() ganttChart: Handsontable.GridSettings['ganttChart'];
@Input() headerTooltips: Handsontable.GridSettings['headerTooltips'];
@Input() height: Handsontable.GridSettings['height'];
@Input() hiddenColumns: Handsontable.GridSettings['hiddenColumns'];
Expand Down Expand Up @@ -116,6 +114,7 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
@Input() placeholder: Handsontable.GridSettings['placeholder'];
@Input() placeholderCellClassName: Handsontable.GridSettings['placeholderCellClassName'];
@Input() preventOverflow: Handsontable.GridSettings['preventOverflow'];
@Input() preventWheel: Handsontable.GridSettings['preventWheel'];
@Input() readOnly: Handsontable.GridSettings['readOnly'];
@Input() readOnlyCellClassName: Handsontable.GridSettings['readOnlyCellClassName'];
@Input() renderAllRows: Handsontable.GridSettings['renderAllRows'];
Expand Down Expand Up @@ -152,10 +151,13 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {

// handsontable hooks
@Input() afterAddChild: Handsontable.GridSettings['afterAddChild'];
@Input() afterAutofill: Handsontable.GridSettings['afterAutofill'];
@Input() afterBeginEditing: Handsontable.GridSettings['afterBeginEditing'];
@Input() afterCellMetaReset: Handsontable.GridSettings['afterCellMetaReset'];
@Input() afterChange: Handsontable.GridSettings['afterChange'];
@Input() afterChangesObserved: Handsontable.GridSettings['afterChangesObserved'];
@Input() afterColumnCollapse: Handsontable.GridSettings['afterColumnCollapse'];
@Input() afterColumnExpand: Handsontable.GridSettings['afterColumnExpand'];
@Input() afterColumnMove: Handsontable.GridSettings['afterColumnMove'];
@Input() afterColumnResize: Handsontable.GridSettings['afterColumnResize'];
@Input() afterColumnSort: Handsontable.GridSettings['afterColumnSort'];
Expand Down Expand Up @@ -218,6 +220,7 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
@Input() afterSetCellMeta: Handsontable.GridSettings['afterSetCellMeta'];
@Input() afterSetDataAtCell: Handsontable.GridSettings['afterSetDataAtCell'];
@Input() afterSetDataAtRowProp: Handsontable.GridSettings['afterSetDataAtRowProp'];
@Input() afterSetSourceDataAtCell: Handsontable.GridSettings['afterSetSourceDataAtCell'];
@Input() afterTrimRow: Handsontable.GridSettings['afterTrimRow'];
@Input() afterUndo: Handsontable.GridSettings['afterUndo'];
@Input() afterUnhideColumns: Handsontable.GridSettings['afterUnhideColumns'];
Expand All @@ -235,6 +238,8 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
@Input() beforeCellAlignment: Handsontable.GridSettings['beforeCellAlignment'];
@Input() beforeChange: Handsontable.GridSettings['beforeChange'];
@Input() beforeChangeRender: Handsontable.GridSettings['beforeChangeRender'];
@Input() beforeColumnCollapse: Handsontable.GridSettings['beforeColumnCollapse'];
@Input() beforeColumnExpand: Handsontable.GridSettings['beforeColumnExpand'];
@Input() beforeColumnMove: Handsontable.GridSettings['beforeColumnMove'];
@Input() beforeColumnResize: Handsontable.GridSettings['beforeColumnResize'];
@Input() beforeColumnSort: Handsontable.GridSettings['beforeColumnSort'];
Expand All @@ -256,6 +261,7 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
@Input() beforeInitWalkontable: Handsontable.GridSettings['beforeInitWalkontable'];
@Input() beforeKeyDown: Handsontable.GridSettings['beforeKeyDown'];
@Input() beforeLanguageChange: Handsontable.GridSettings['beforeLanguageChange'];
@Input() beforeLoadData: Handsontable.GridSettings['beforeLoadData'];
@Input() beforeMergeCells: Handsontable.GridSettings['beforeMergeCells'];
@Input() beforeOnCellContextMenu: Handsontable.GridSettings['beforeOnCellContextMenu'];
@Input() beforeOnCellMouseDown: Handsontable.GridSettings['beforeOnCellMouseDown'];
Expand All @@ -273,6 +279,7 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
@Input() beforeRenderer: Handsontable.GridSettings['beforeRenderer'];
@Input() beforeRowMove: Handsontable.GridSettings['beforeRowMove'];
@Input() beforeRowResize: Handsontable.GridSettings['beforeRowResize'];
@Input() beforeSetCellMeta: Handsontable.GridSettings['beforeSetCellMeta'];
@Input() beforeSetRangeEnd: Handsontable.GridSettings['beforeSetRangeEnd'];
@Input() beforeSetRangeStart: Handsontable.GridSettings['beforeSetRangeStart'];
@Input() beforeSetRangeStartOnly: Handsontable.GridSettings['beforeSetRangeStartOnly'];
Expand All @@ -287,30 +294,24 @@ export class HotTableComponent implements AfterViewInit, OnChanges, OnDestroy {
@Input() beforeValidate: Handsontable.GridSettings['beforeValidate'];
@Input() beforeValueRender: Handsontable.GridSettings['beforeValueRender'];
@Input() construct: Handsontable.GridSettings['construct'];
@Input() hiddenColumn: Handsontable.GridSettings['hiddenColumn'];
@Input() hiddenRow: Handsontable.GridSettings['hiddenRow'];
@Input() init: Handsontable.GridSettings['init'];
@Input() modifyAutofillRange: Handsontable.GridSettings['modifyAutofillRange'];
@Input() modifyCol: Handsontable.GridSettings['modifyCol'];
@Input() modifyColHeader: Handsontable.GridSettings['modifyColHeader'];
@Input() modifyColumnHeaderHeight: Handsontable.GridSettings['modifyColumnHeaderHeight'];
@Input() modifyColWidth: Handsontable.GridSettings['modifyColWidth'];
@Input() modifyCopyableRange: Handsontable.GridSettings['modifyCopyableRange'];
@Input() modifyData: Handsontable.GridSettings['modifyData'];
@Input() modifyGetCellCoords: Handsontable.GridSettings['modifyGetCellCoords'];
@Input() modifyRow: Handsontable.GridSettings['modifyRow'];
@Input() modifyRowData: Handsontable.GridSettings['modifyRowData'];
@Input() modifyRowHeader: Handsontable.GridSettings['modifyRowHeader'];
@Input() modifyRowHeaderWidth: Handsontable.GridSettings['modifyRowHeaderWidth'];
@Input() modifyRowHeight: Handsontable.GridSettings['modifyRowHeight'];
@Input() modifySourceData: Handsontable.GridSettings['modifySourceData'];
@Input() modifyTransformEnd: Handsontable.GridSettings['modifyTransformEnd'];
@Input() modifyTransformStart: Handsontable.GridSettings['modifyTransformStart'];
@Input() persistentStateLoad: Handsontable.GridSettings['persistentStateLoad'];
@Input() persistentStateReset: Handsontable.GridSettings['persistentStateReset'];
@Input() persistentStateSave: Handsontable.GridSettings['persistentStateSave'];
@Input() skipLengthCache: Handsontable.GridSettings['skipLengthCache'];
@Input() unmodifyCol: Handsontable.GridSettings['unmodifyCol'];
@Input() unmodifyRow: Handsontable.GridSettings['unmodifyRow'];

constructor(
private _ngZone: NgZone,
Expand Down
2 changes: 1 addition & 1 deletion projects/hot-table/src/lib/hot-table.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Version {
]
})
export class HotTableModule extends Version {
public static forRoot(): ModuleWithProviders {
public static forRoot(): ModuleWithProviders<HotTableModule> {
return {
ngModule: HotTableModule,
providers: [ HotTableRegisterer ],
Expand Down

0 comments on commit 6c66eab

Please sign in to comment.