Merge branch 'master' into release/1.3.12

Author: Anthony Dresser

components/index.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-export * from './js/gridsync.service';
 export * from './js/interfaces';
 export * from './js/selectionModel';
 export * from './js/slickGrid';

components/js/gridsync.service.ts

@@ -46,24 +46,6 @@ export class CancellationToken {
     }
 }
 
-export enum FieldType {
-    String = 0,
-    Boolean = 1,
-    Integer = 2,
-    Decimal = 3,
-    Date = 4,
-    Unknown = 5
-}
-
-export interface IColumnDefinition {
-    id?: string;
-    name: string;
-    type: FieldType;
-    asyncPostRender?: (cellRef: string, row: number, dataContext: JSON, colDef: any) => void;
-    formatter?: (row: number, cell: any, value: any, columnDef: any, dataContext: any) => string;
-    isEditable?: boolean;
-}
-
 export interface IGridColumnDefinition {
     id: string;
     type: number;
@@ -73,3 +55,7 @@ export interface IGridDataRow {
     row?: number;
     values: any[];
 }
+
+export interface ISlickColumn<T> extends Slick.Column<T> {
+    isEditable?: boolean;
+}

components/js/interfaces.ts

@@ -9,9 +9,9 @@ export class SelectionModel implements ISlickSelectionModel {
     constructor(private _rowSelectionModel: ISlickSelectionModel,
                 private _handler: ISlickEventHandler,
                 private _onSelectedRangesChanged: ISlickEvent,
-                private _slickRangeFactory: (fromRow: number, fromCell: number, toRow: number, toCell: number) => ISlickRange) { }
+                private _slickRangeFactory: (fromRow: number, fromCell: number, toRow: number, toCell: number) => Slick.Range) { }
 
-    get range(): ISlickRange[] {
+    get range(): Slick.Range[] {
         return this._ranges;
     }
 
@@ -32,11 +32,11 @@ export class SelectionModel implements ISlickSelectionModel {
         this._rowSelectionModel.destroy();
     }
 
-    setSelectedRanges(ranges: ISlickRange[]): void {
+    setSelectedRanges(ranges: Slick.Range[]): void {
         this._rowSelectionModel.setSelectedRanges(ranges);
     }
 
-    getSelectedRanges(): ISlickRange[] {
+    getSelectedRanges(): Slick.Range[] {
         return this._rowSelectionModel.getSelectedRanges();
     }
 
@@ -121,10 +121,10 @@ export class SelectionModel implements ISlickSelectionModel {
     }
 
     private _grid: ISlickGrid;
-    private _ranges: ISlickRange[] = [];
+    private _ranges: Slick.Range[] = [];
     private _lastSelectedColumnIndexSequence: number[] = [];
 
-    private static areRangesIdentical(lhs: ISlickRange[], rhs: ISlickRange[]): boolean {
+    private static areRangesIdentical(lhs: Slick.Range[], rhs: Slick.Range[]): boolean {
         if (lhs && rhs && (lhs !== rhs) && lhs.length === rhs.length) {
             for (let i = 0; i < lhs.length; ++i) {
                 if (lhs[i].fromRow !== rhs[i].fromRow
@@ -139,12 +139,12 @@ export class SelectionModel implements ISlickSelectionModel {
         return false;
     }
 
-    private getColumnRange(columnId: string): ISlickRange {
+    private getColumnRange(columnId: string): Slick.Range {
         let columnIndex = this._grid.getColumnIndex(columnId);
         return this.getColumnRangeByIndex(columnIndex);
     }
 
-    private getColumnRangeByIndex(columnIndex: number): ISlickRange {
+    private getColumnRangeByIndex(columnIndex: number): Slick.Range {
         let rowCount = this._grid.getDataLength();
         let lastRowToSelect =  rowCount === 0 ? 0 : rowCount - 1 ;
         return this._slickRangeFactory(0, columnIndex, lastRowToSelect, columnIndex);
@@ -160,7 +160,7 @@ export class SelectionModel implements ISlickSelectionModel {
             }) === undefined;
     }
 
-    private updateSelectedRanges(ranges: ISlickRange[]): void {
+    private updateSelectedRanges(ranges: Slick.Range[]): void {
         // Set focus to this grid if it's not already somewhere inside it.
         if (ranges && ranges.length !== 0 && this._grid && this._grid.getCanvasNode() && !this._grid.getCanvasNode().contains(document.activeElement)) {
             this._grid.focus();
@@ -176,12 +176,12 @@ export class SelectionModel implements ISlickSelectionModel {
 }
 
 export interface ISlickSelectionModel {
-    range: ISlickRange[];
+    range: Slick.Range[];
     onSelectedRangesChanged: any;
     init(grid: any): void;
     destroy(): void;
-    setSelectedRanges(ranges: ISlickRange[]): void;
-    getSelectedRanges(): ISlickRange[];
+    setSelectedRanges(ranges: Slick.Range[]): void;
+    getSelectedRanges(): Slick.Range[];
 }
 
 export interface ISlickEventHandler {
@@ -190,17 +190,10 @@ export interface ISlickEventHandler {
 }
 
 export interface ISlickEvent {
-    notify(eventData: ISlickRange[]): void;
+    notify(eventData: Slick.Range[]): void;
     subscribe(handler: (e: any, args: any) => void): void;
 }
 
-export interface ISlickRange {
-    fromCell: number;
-    fromRow: number;
-    toCell: number;
-    toRow: number;
-}
-
 export interface ISlickGrid {
     getActiveCellNode(): any;
     getCanvasNode(): any;