Merge branch 'master' into master

README.md

@@ -18,7 +18,7 @@ See the [changelog](https://github.com/swimlane/ngx-datatable/blob/master/docs/c
 - Expressive Header and Cell Templates
 - Horizontal & Vertical Scrolling
 - Column Reordering & Resizing
-- Client/Serve side Pagination & Sorting
+- Client/Server side Pagination & Sorting
 - Intelligent Column Width Algorithms ( Force-fill & Flex-grow )
 - Integrated Pager
 - Cell & Row Selection ( Single, Multi, Keyboard, Checkbox )

docs/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 9.2.0
+- Enhancement: Add header context menu event
+- Bug: Fix sort blowing up when undefined and adding new sort
+- Bug: Fix multi-selection key with Mac
+
 ## 9.1.0
 - Enhancement: Add more context to cells #720
 - Enhancement: Export Pager component #735

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swimlane/ngx-datatable",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "description": "ngx-datatable is a Angular2+ table grid component for presenting large and complex data.",
   "main": "release/index.js",
   "typings": "release/index.d.ts",
@@ -73,19 +73,19 @@
     "rxjs": "^5.0.0"
   },
   "devDependencies": {
-    "@angular/animations": "^4.0.3",
-    "@angular/common": "^4.0.3",
-    "@angular/compiler": "^4.0.3",
-    "@angular/compiler-cli": "^4.0.3",
-    "@angular/core": "^4.0.3",
-    "@angular/platform-browser": "^4.0.3",
-    "@angular/platform-browser-dynamic": "^4.0.3",
-    "@angular/platform-server": "^4.0.3",
+    "@angular/animations": "^4.1.3",
+    "@angular/common": "^4.1.3",
+    "@angular/compiler": "^4.1.3",
+    "@angular/compiler-cli": "^4.1.3",
+    "@angular/core": "^4.1.3",
+    "@angular/platform-browser": "^4.1.3",
+    "@angular/platform-browser-dynamic": "^4.1.3",
+    "@angular/platform-server": "^4.1.3",
     "@types/jasmine": "^2.5.47",
-    "@types/node": "^7.0.13",
+    "@types/node": "^7.0.22",
     "angular2-template-loader": "^0.6.2",
     "autoprefixer": "^6.7.7",
-    "awesome-typescript-loader": "^3.1.2",
+    "awesome-typescript-loader": "^3.1.3",
     "clean-webpack-plugin": "^0.1.16",
     "copy-webpack-plugin": "^4.0.0",
     "core-js": "^2.4.0",
@@ -115,24 +115,24 @@
     "protractor": "^5.1.1",
     "replace": "^0.3.0",
     "rimraf": "^2.6.1",
-    "rxjs": "^5.3.0",
+    "rxjs": "^5.4.0",
     "sass-loader": "^6.0.3",
     "source-map-loader": "^0.2.1",
     "style-loader": "^0.16.1",
     "to-string-loader": "^1.1.5",
     "ts-helpers": "^1.1.2",
-    "ts-node": "^3.0.2",
-    "tslint": "^5.1.0",
-    "tslint-config-swimlane": "^3.0.0",
+    "ts-node": "^3.0.4",
+    "tslint": "^5.3.2",
+    "tslint-config-swimlane": "^3.0.1",
     "tslint-loader": "^3.5.3",
-    "typescript": "^2.2.2",
-    "uglifyjs": "~2.4.10",
+    "typescript": "^2.3.3",
+    "uglifyjs": "^2.4.10",
     "url-loader": "^0.5.8",
-    "webpack": "^2.4.1",
+    "webpack": "^2.6.1",
     "webpack-combine-loaders": "^2.0.3",
-    "webpack-dev-server": "^2.4.4",
+    "webpack-dev-server": "^2.4.5",
     "webpack-merge": "^4.1.0",
     "webpack-notifier": "^1.5.0",
-    "zone.js": "^0.8.9"
+    "zone.js": "^0.8.11"
   }
 }

release/components/datatable.component.d.ts

@@ -1,6 +1,6 @@
 import { ElementRef, EventEmitter, OnInit, QueryList, AfterViewInit, DoCheck, KeyValueDiffers, KeyValueDiffer } from '@angular/core';
 import { ScrollbarHelper } from '../services';
-import { ColumnMode, SortType, SelectionType, TableColumn } from '../types';
+import { ColumnMode, SortType, SelectionType, TableColumn, ContextmenuType } from '../types';
 import { DataTableBodyComponent } from './body';
 import { DataTableColumnDirective } from './columns';
 import { DatatableRowDetailDirective } from './row-detail';
@@ -290,13 +290,16 @@ export declare class DatatableComponent implements OnInit, AfterViewInit, DoChec
      */
     resize: EventEmitter<any>;
     /**
-     * The context menu was invoked on a row.
+     * The context menu was invoked on the table.
+     * type indicates whether the header or the body was clicked.
+     * content contains either the column or the row that was clicked.
      *
      * @memberOf DatatableComponent
      */
-    rowContextmenu: EventEmitter<{
+    tableContextmenu: EventEmitter<{
         event: MouseEvent;
-        row: any;
+        type: ContextmenuType;
+        content: any;
     }>;
     /**
      * CSS class applied if the header height if fixed height.
@@ -546,6 +549,22 @@ export declare class DatatableComponent implements OnInit, AfterViewInit, DoChec
      * @memberOf DatatableComponent
      */
     calcRowCount(val?: any[]): number;
+    /**
+     * The header triggered a contextmenu event.
+     *
+     * @param {*} { event, column }
+     *
+     * @memberOf DatatableComponent
+     */
+    onColumnContextmenu({event, column}: any): void;
+    /**
+     * The body triggered a contextmenu event.
+     *
+     * @param {*} { event, row }
+     *
+     * @memberOf DatatableComponent
+     */
+    onRowContextmenu({event, row}: any): void;
     /**
      * The header triggered a column resize event.
      *