@refinitiv-ui/efx-grid 6.0.4 → 6.0.6

package/lib/core/es6/grid/components/CellFloatingPanel.d.ts

@@ -7,9 +7,9 @@ declare class CellFloatingPanel extends ElementWrapper {
 
     public hasItem(): boolean;
 
-    public insertItem(item: Element, opt_order?: number): void;
+    public insertItem(item: Element|null, opt_order?: number|null): void;
 
-    public removeItem(elemRef?: (Element|string)): Element|null|null;
+    public removeItem(elemRef?: (Element|string)|null): Element|null|null;
 
     public clearItems(): void;
 

package/lib/core/es6/grid/components/CellSpans.d.ts

@@ -10,9 +10,9 @@ declare class CellSpans {
 
     public removeSpan(indexX: number, indexY: number): CellSpan|null;
 
-    public removeSpanByColIndex(at: number, opt_ary?: (CellSpan)[]): (CellSpan)[]|null;
+    public removeSpanByColIndex(at: number, opt_ary?: (CellSpan)[]|null): (CellSpan)[]|null;
 
-    public removeSpanStartedFromRowIndex(at: number, opt_ary?: (CellSpan)[]): (CellSpan)[]|null;
+    public removeSpanStartedFromRowIndex(at: number, opt_ary?: (CellSpan)[]|null): (CellSpan)[]|null;
 
     public clearAllSpans(): (CellSpan)[]|null;
 

package/lib/core/es6/grid/components/Column.d.ts

@@ -6,11 +6,11 @@ import ILayoutGrid from "../ILayoutGrid.js";
 
 declare class Column extends ElementWrapper {
 
-    constructor(section: ILayoutGrid);
+    constructor(section: ILayoutGrid|null);
 
     public clearContent(): void;
 
-    public setNextSibling(sibling: Column): void;
+    public setNextSibling(sibling: Column|null): void;
 
     public isActive(): boolean;
 

package/lib/core/es6/grid/components/ElementWrapper.d.ts

@@ -5,21 +5,21 @@ import Util from "../util/util.js";
 
 declare class ElementWrapper extends EventDispatcher {
 
-    constructor(opt_element?: Element);
+    constructor(opt_element?: Element|null);
 
-    public getContent(opt_allContent?: boolean): Element|Node|NodeList|null;
+    public getContent(opt_allContent?: boolean|null): Element|Node|NodeList|null;
 
-    public setContent(content: string|Element|ElementWrapper|any, opt_tooltip?: string): Element|null;
+    public setContent(content: string|Element|ElementWrapper|any, opt_tooltip?: string|null): Element|null;
 
-    public addContent(content: Element|Node|ElementWrapper): Element|null;
+    public addContent(content: Element|Node|ElementWrapper|null): Element|null;
 
-    public removeContent(content: Element|Node|ElementWrapper): boolean;
+    public removeContent(content: Element|Node|ElementWrapper|null): boolean;
 
-    public listen(type: string, handler: ((...params: any[]) => any), opt_priority?: number): void;
+    public listen(type: string, handler: ((...params: any[]) => any)|null, opt_priority?: number|null): void;
 
-    public unlisten(type: string, handler: ((...params: any[]) => any)): void;
+    public unlisten(type: string, handler: ((...params: any[]) => any)|null): void;
 
-    public unlistenAll(opt_type?: string): void;
+    public unlistenAll(opt_type?: string|null): void;
 
     public dispose(): void;
 
@@ -29,11 +29,11 @@ declare class ElementWrapper extends EventDispatcher {
 
     public getParent(): Element|Node|null;
 
-    public setParent(parent: ElementWrapper|Element|Node, opt_prepend?: boolean): void;
+    public setParent(parent: ElementWrapper|Element|Node|null, opt_prepend?: boolean|null): void;
 
-    public insertBefore(nextSibling: ElementWrapper|Element|Node): void;
+    public insertBefore(nextSibling: ElementWrapper|Element|Node|null): void;
 
-    public insertAfter(previousSibling: ElementWrapper|Element|Node): void;
+    public insertAfter(previousSibling: ElementWrapper|Element|Node|null): void;
 
     public hasClass(str: string): boolean;
 
@@ -41,9 +41,9 @@ declare class ElementWrapper extends EventDispatcher {
 
     public removeClass(str: string): void;
 
-    public toggleClass(cls: string, forcedVal?: (boolean|null)): void;
+    public toggleClass(cls: string, forcedVal?: (boolean|null)|null): void;
 
-    public enableClass(str: string, opt_enabled?: boolean): void;
+    public enableClass(str: string, opt_enabled?: boolean|null): void;
 
     public getClass(): string;
 
@@ -91,23 +91,23 @@ declare class ElementWrapper extends EventDispatcher {
 
     public getBoundingClientRect(): any;
 
-    public fillParentWidth(opt_percent?: number): boolean;
+    public fillParentWidth(opt_percent?: number|null): boolean;
 
-    public fillParentHeight(opt_percent?: number): boolean;
+    public fillParentHeight(opt_percent?: number|null): boolean;
 
     public getTooltip(): string;
 
     public setTooltip(str: string): void;
 
-    public show(opt_shown?: boolean): void;
+    public show(opt_shown?: boolean|null): void;
 
-    public hide(opt_hidden?: boolean): void;
+    public hide(opt_hidden?: boolean|null): void;
 
     public isVisible(): boolean;
 
-    public enable(opt_enabled?: boolean): void;
+    public enable(opt_enabled?: boolean|null): void;
 
-    public disable(opt_disabled?: boolean): void;
+    public disable(opt_disabled?: boolean|null): void;
 
     public isEnabled(): boolean;
 

package/lib/core/es6/grid/components/Scrollbar.d.ts

@@ -9,15 +9,15 @@ declare class Scrollbar extends ElementWrapper {
 
     public static updateTrackThickness(): void;
 
-    public attachToExternalElement(host: Element|Node): void;
+    public attachToExternalElement(host: Element|Node|null): void;
 
     public isActive(): boolean;
 
     public isEnabled(): boolean;
 
-    public enable(opt_enabled?: boolean): void;
+    public enable(opt_enabled?: boolean|null): void;
 
-    public disable(opt_disabled?: boolean): void;
+    public disable(opt_disabled?: boolean|null): void;
 
     public getTrackSize(): number;
 
@@ -33,19 +33,19 @@ declare class Scrollbar extends ElementWrapper {
 
     public flash(): void;
 
-    public disableKeyboardInput(opt_disabled?: boolean): void;
+    public disableKeyboardInput(opt_disabled?: boolean|null): void;
 
-    public disableTouchInput(opt_disabled?: boolean): void;
+    public disableTouchInput(opt_disabled?: boolean|null): void;
 
     public setAutoHide(hide: boolean): void;
 
     public getAutoHide(): boolean;
 
-    public disableMouseWheel(opt_disabled?: boolean): void;
+    public disableMouseWheel(opt_disabled?: boolean|null): void;
 
-    public addWheelListener(elem: Element): void;
+    public addWheelListener(elem: Element|null): void;
 
-    public removeWheelListener(elem: Element): void;
+    public removeWheelListener(elem: Element|null): void;
 
     public setMouseWheelSpeed(val: string): void;
 
@@ -53,7 +53,9 @@ declare class Scrollbar extends ElementWrapper {
 
     public setScrollingStep(px: number): void;
 
-    public freezeScrolling(frozen?: boolean): boolean;
+    public freezeScrolling(frozen?: boolean|null): boolean;
+
+    public restoreTrackPosition(): void;
 
 }
 

package/lib/core/es6/grid/components/Scrollbar.js

@@ -1367,6 +1367,19 @@ Scrollbar.prototype.freezeScrolling = function (frozen) {
 	this._isFrozen = frozen !== false;
 	return prev;
 };
+/** @public
+*/
+Scrollbar.prototype.restoreTrackPosition = function () {
+	// Scroll event will be fired asynchronously, if there is any change
+	var track = this._element;
+	if(this._vertical) {
+		track.scrollTop = this._tScrollVal;
+		if(track.scrollTop){
+			this._tScrollVal = track.scrollTop; //Check to ensure that cache equal to element's scroll
+		}
+	}
+	//TODO: handle restore scrollLeft for hscroll
+};
 
 Scrollbar._proto = Scrollbar.prototype;
 

package/lib/core/es6/grid/components/StretchedCells.js

@@ -198,7 +198,7 @@ StretchedCells.prototype.getRowIndex = function (cellRef) {
 * @return {Cell}
 */
 StretchedCells.prototype.stretchCell = function (rowIndex, colIndex) {
-	// Increase the active count regardless of redundancy. This acts as a dirty flag. It does not needed to be accurate
+	// Increase the active count regardless of redundancy. This acts as a dirty flag. It does not need to be accurate
 	++this._activeCount;
 	if(!colIndex || colIndex < 0) {
 		colIndex = 0;
@@ -213,7 +213,17 @@ StretchedCells.prototype.stretchCell = function (rowIndex, colIndex) {
 	}
 	var cellElem = cell["getElement"]();
 	cellElem["stretched"] = true;
-	cellElem._colIndex = colIndex;
+	if(cellElem._colIndex !== colIndex) {
+		cellElem._colIndex = colIndex;
+		if(colIndex > 0) {
+			cellElem.classList.add("right-stretching");
+		} else {
+			cellElem.classList.remove("right-stretching");
+		}
+	}
+	if(cellElem._rowIndex !== rowIndex) {
+		cellElem._rowIndex = rowIndex;
+	}
 
 	var width = this._stretchSize || this._trackX.getTrackSize();
 	_updateXAxis(cell, this._trackX, colIndex, width);

package/lib/core/es6/grid/event/EventDispatcher.d.ts

@@ -4,11 +4,11 @@ declare class EventDispatcher {
 
     constructor();
 
-    public listen(type: string, handler: ((...params: any[]) => any), opt_priority?: number): void;
+    public listen(type: string, handler: ((...params: any[]) => any)|null, opt_priority?: number|null): void;
 
-    public unlisten(type: string, handler: ((...params: any[]) => any)): void;
+    public unlisten(type: string, handler: ((...params: any[]) => any)|null): void;
 
-    public unlistenAll(type?: string): void;
+    public unlistenAll(type?: string|null): void;
 
 }
 

package/lib/core/es6/grid/event/EventListeners.d.ts

@@ -4,9 +4,9 @@ declare class EventListeners {
 
     constructor(opt_sender?: any|null);
 
-    public listen(listener: ((...params: any[]) => any), opt_priority?: number): void;
+    public listen(listener: ((...params: any[]) => any)|null, opt_priority?: number|null): void;
 
-    public unlisten(listener: ((...params: any[]) => any)): void;
+    public unlisten(listener: ((...params: any[]) => any)|null): void;
 
     public unlistenAll(): void;
 
@@ -20,13 +20,13 @@ declare class EventListeners {
 
     public isEnabled(): boolean;
 
-    public enable(opt_enabled?: boolean): void;
+    public enable(opt_enabled?: boolean|null): void;
 
-    public disable(opt_disabled?: boolean): void;
+    public disable(opt_disabled?: boolean|null): void;
 
     public setSender(sender: any|null): void;
 
-    public setEventArgExtender(extender?: ((...params: any[]) => any)): void;
+    public setEventArgExtender(extender?: ((...params: any[]) => any)|null): void;
 
 }
 

package/lib/core/es6/grid/plugins/SortableTitlePlugin.d.ts

@@ -7,47 +7,48 @@ import DataTable from "../../data/DataTable.js";
 
 declare namespace SortableTitlePlugin {
 
-    type SortOrder = "a" | "ascending" | "d" | "descending" | "n" | null;
+    type SortOrder = "a" | "ascending" | "d" | "descending" | "n" | null|null;
 
     type InitialSort = {
         colIndex: number,
-        sortOrder?: SortableTitlePlugin.SortOrder,
-        order?: SortableTitlePlugin.SortOrder
+        sortOrder?: SortableTitlePlugin.SortOrder|null,
+        order?: SortableTitlePlugin.SortOrder|null
     };
 
     type ColumnOptions = {
-        sortable?: boolean,
-        sortBy?: string,
-        sortLogic?: DataTable.SortLogic,
-        sortingLogic?: DataTable.SortLogic,
-        sorter?: DataTable.SortLogic,
-        sortingSequence?: (SortableTitlePlugin.SortOrder)[]
+        sortable?: boolean|null,
+        sortBy?: string|null,
+        sortLogic?: DataTable.SortLogic|null,
+        sortingLogic?: DataTable.SortLogic|null,
+        sorter?: DataTable.SortLogic|null,
+        sortingSequence?: (SortableTitlePlugin.SortOrder)[]|null
     };
 
     type Options = {
-        initialSort?: (SortableTitlePlugin.InitialSort|(SortableTitlePlugin.InitialSort)[]),
-        multicolumn?: (boolean|number),
-        multiColumn?: (boolean|number),
-        threeStatesSorting?: boolean,
-        sortLogic?: { [key: string]:  DataTable.SortLogic },
-        disableDoubleClickToSort?: boolean,
-        sortableColumns?: boolean,
-        sortableIndicator?: boolean,
-        indicatorOnly?: boolean,
-        mode?: string,
-        disabled?: boolean,
-        columnSorted?: ((...params: any[]) => any),
-        preClicked?: ((...params: any[]) => any),
-        clicked?: ((...params: any[]) => any),
-        preDataSorting?: ((...params: any[]) => any),
-        sortingSequence?: (SortableTitlePlugin.SortOrder)[]
+        initialSort?: (SortableTitlePlugin.InitialSort|(SortableTitlePlugin.InitialSort)[])|null,
+        multicolumn?: (boolean|number)|null,
+        multiColumn?: (boolean|number)|null,
+        threeStatesSorting?: boolean|null,
+        sortLogic?: { [key: string]:  DataTable.SortLogic }|null,
+        disableDoubleClickToSort?: boolean|null,
+        sortableColumns?: boolean|null,
+        sortableIndicator?: boolean|null,
+        indicatorOnly?: boolean|null,
+        mode?: string|null,
+        disabled?: boolean|null,
+        columnSorted?: ((...params: any[]) => any)|null,
+        preClicked?: ((...params: any[]) => any)|null,
+        clicked?: ((...params: any[]) => any)|null,
+        preDataSorting?: ((...params: any[]) => any)|null,
+        sortingSequence?: (SortableTitlePlugin.SortOrder)[]|null,
+        rowSorting?: boolean|null
     };
 
 }
 
 declare class SortableTitlePlugin extends EventDispatcher {
 
-    constructor(options?: SortableTitlePlugin.Options);
+    constructor(options?: SortableTitlePlugin.Options|null);
 
     public getName(): string;
 
@@ -65,13 +66,13 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public getIcons(): { [key: string]:  string }|null;
 
-    public setSortLogics(sortLogic: { [key: string]:  ((...params: any[]) => any) }): void;
+    public setSortLogics(sortLogic: { [key: string]:  ((...params: any[]) => any) }|null): void;
 
-    public setSortLogic(field: string, func: ((...params: any[]) => any)): void;
+    public setSortLogic(field: string, func: ((...params: any[]) => any)|null): void;
 
-    public getSortOrder(colIndex?: number): string;
+    public getSortOrder(colIndex?: number|null): string;
 
-    public getSortedColumnIndex(priority?: number): number;
+    public getSortedColumnIndex(priority?: number|null): number;
 
     public getSortPriority(colIndex: number): number;
 
@@ -81,9 +82,9 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public isSorting(): boolean;
 
-    public sortColumn(colRef: number|string, sortOrder?: string, opt_arg?: any): void;
+    public sortColumn(colRef: number|string|null, sortOrder?: string|null, opt_arg?: any): void;
 
-    public sortColumns(sortOptions: (SortableTitlePlugin.InitialSort)[], opt_arg?: any): void;
+    public sortColumns(sortOptions: (SortableTitlePlugin.InitialSort)[]|null, opt_arg?: any): void;
 
     public clearSortState(opt_arg?: any): void;
 
@@ -99,37 +100,37 @@ declare class SortableTitlePlugin extends EventDispatcher {
 
     public getDataColumnMap(): (string)[];
 
-    public setDataColumnMap(dataMap: (string|null)[]): void;
+    public setDataColumnMap(dataMap: (string|null)[]|null): void;
 
     public getColumnSortingField(colIndex: number): string;
 
-    public setColumnSortingField(colIndex: number, field: string|null, sortLogic?: ((...params: any[]) => any)): void;
+    public setColumnSortingField(colIndex: number, field: string|null|null, sortLogic?: ((...params: any[]) => any)|null, rowSorting?: boolean|null): void;
 
     public getColumnSortingFields(): (string)[];
 
-    public disableTwoStateSorting(disabled?: boolean): void;
+    public disableTwoStateSorting(disabled?: boolean|null): void;
 
-    public disableSortSymbols(disabled?: boolean): void;
+    public disableSortSymbols(disabled?: boolean|null): void;
 
-    public disableDataSorting(disabled?: boolean): void;
+    public disableDataSorting(disabled?: boolean|null): void;
 
-    public disableDoubleClickToSort(disabled?: boolean): void;
+    public disableDoubleClickToSort(disabled?: boolean|null): void;
 
-    public disableCellClick(cell: ElementWrapper, disabled?: boolean): void;
+    public disableCellClick(cell: ElementWrapper|null, disabled?: boolean|null): void;
 
-    public disableColumnSorting(columns: number|(number)[], disabled?: boolean): void;
+    public disableColumnSorting(columns: number|(number)[]|null, disabled?: boolean|null): void;
 
-    public setClickDelayInterval(opt_ms?: number): void;
+    public setClickDelayInterval(opt_ms?: number|null): void;
 
-    public getSortingSequence(colRef?: (number|string)): (string)[];
+    public getSortingSequence(colRef?: (number|string)|null): (string)[];
 
-    public setSortingSequence(sequence: (string)[], colRef?: (number|string)): void;
+    public setSortingSequence(sequence: (string)[]|null, colRef?: (number|string)|null): void;
 
     public clearAllColumnSortingSequences(): void;
 
 }
 
-declare function len(disabled?: boolean): void;
+declare function len(disabled?: boolean|null): void;
 
 export default SortableTitlePlugin;
 export { SortableTitlePlugin };

package/lib/core/es6/grid/plugins/SortableTitlePlugin.js

@@ -104,7 +104,7 @@ SortableTitlePlugin.ColumnOptions;
  * @property {(boolean|number)=} multiColumn=false Alias to `multicolumn`
  * @property {boolean=} threeStatesSorting=false If enabled, sorting will cycle through ascending, descending and original order states. This option is deprecated in favor of sortingSequence option
  * @property {Object.<string, DataTable.SortLogic>=} sortLogic=null Custom logic for sorting based on the specified field. The key is field name and the value pair is a function.
- * @property {boolean=} disableDoubleClickToSort=false If enabled, double click on column title to sort
+ * @property {boolean=} disableDoubleClickToSort=true If disabled, double click will trigger sorting operation
  * @property {boolean=} sortableColumns=false If enabled, all columns will be sortable by field automatically
  * @property {boolean=} sortableIndicator=false If enabled, sort indicator (diamond) icon will always show regardless of sorting states. In Halo theme, this option will be enabled by default.
  * @property {boolean=} indicatorOnly=false If enabled, data will not be sorted, but the UI is rendered normally. This is useful for server side sorting.
@@ -114,7 +114,8 @@ SortableTitlePlugin.ColumnOptions;
  * @property {Function=} preClicked A shortcut to define the preClicked event handler
  * @property {Function=} clicked A shortcut to define the clicked event handler
  * @property {Function=} preDataSorting A shortcut to define the preDataSorting event handler
- * @property {Array.<SortableTitlePlugin~SortOrder>=} sortingSequence=["a", "d"] Sequence in which sort order will be changed. The default value is ["a", "d"]. This option override threeStatesSorting
+ * @property {Array.<SortableTitlePlugin~SortOrder>=} sortingSequence=["a", "d"] Sequence in which sort order will be changed. The default value is ["a", "d"]. This option overrides threeStatesSorting
+ * @property {boolean=} rowSorting=false A flag indicating that the given sortLogic takes entire row data instead of a field value for comparison
  */
 SortableTitlePlugin.Options;
 
@@ -143,7 +144,7 @@ SortableTitlePlugin.prototype._dataSorting = true;
 /** @private
 * @type {boolean}
 */
-SortableTitlePlugin.prototype._isDisableDoubleClickToSort = true;
+SortableTitlePlugin.prototype._dblClickAllowed = false;
 
 /** @private
 * @type {number}
@@ -286,19 +287,20 @@ SortableTitlePlugin.prototype.unload = function (host) {
 SortableTitlePlugin.prototype.afterInit = function () {
 	var t = this;
 
-	// Data source not available during initialization
+	// Set logic to the data source, since the data source not available during the initialization
 	t.setSortLogics(t._sortLogic);
 
-	// Sort columns if initialSort are specified initially
-	if (t._initialSort != null) {
-		var initialSort = t._initialSort;
-		if (!Array.isArray(initialSort)) {
-			initialSort = [initialSort];
-		}
-		if (t._maxCount === 1) {
-			initialSort = initialSort.slice(0, 1); // Ensure only 1 item is sorted in non-multiColumn mode
+	var userInput = t._initialSort;
+	if (userInput != null) {
+		if(Array.isArray(userInput)) {
+			if(t._maxCount === 1) { // TODO: max count could be part of sortColumns method
+				t.sortColumns(userInput.slice(0, 1));
+			} else {
+				t.sortColumns(userInput);
+			}
+		} else {
+			t.sortColumns([userInput]);
 		}
-		t.sortColumns(initialSort);
 	}
 };
 
@@ -476,7 +478,9 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 	if(this._maxCount !== 1) {
 		extOptions["multiColumn"] = this._maxCount === -1 ? true : this._maxCount;
 	}
-	extOptions["disableDoubleClickToSort"] = this._isDisableDoubleClickToSort;
+	if(this._dblClickAllowed) {
+		extOptions["disableDoubleClickToSort"] = !this._dblClickAllowed;
+	}
 	extOptions["sortableColumns"] = this._sortableColumns;
 	extOptions["indicatorOnly"] = !this._dataSorting;
 	// extOptions["mode"] = this._mode;
@@ -849,9 +853,10 @@ SortableTitlePlugin.prototype.getColumnSortingField = function (colIndex) {
 * @public
 * @param {number} colIndex
 * @param {string|null} field A field used for sorting
-* @param {Function=} sortLogic
+* @param {Function=} sortLogic=null
+* @param {boolean=} rowSorting=false A flag indicating that the given sortLogic takes entire row data instead of a field value for comparison
 */
-SortableTitlePlugin.prototype.setColumnSortingField = function (colIndex, field, sortLogic) {
+SortableTitlePlugin.prototype.setColumnSortingField = function (colIndex, field, sortLogic, rowSorting) {
 	if (typeof colIndex == "number" && field != null) {
 		var options = this._newSortOptions(colIndex);
 		if (!field) {
@@ -863,6 +868,9 @@ SortableTitlePlugin.prototype.setColumnSortingField = function (colIndex, field,
 		if(sortLogic != null && !this._userManagedLogic) {
 			if (options["sortLogic"] !== sortLogic) {
 				options["sortLogic"] = sortLogic || null;
+				if(rowSorting && sortLogic) {
+					sortLogic["rowSorting"] = true; // Tell data view/table about the argument
+				}
 			}
 		}
 	}
@@ -962,10 +970,10 @@ SortableTitlePlugin.prototype.disableDataSorting = function (disabled) {
 };
 /** @public
 * @description To allow double click action to sort. Default value is false.
-* @param {boolean=} disabled
+* @param {boolean=} disabled=false
 */
 SortableTitlePlugin.prototype.disableDoubleClickToSort = function (disabled) {
-	this._isDisableDoubleClickToSort = !!disabled;
+	this._dblClickAllowed = !disabled;
 };
 /** This api is deprecated. Use {@link SortableTitlePlugin.prototype.disableColumnSorting} instead
  * @public
@@ -1011,54 +1019,26 @@ SortableTitlePlugin.prototype.setClickDelayInterval = function (opt_ms) {
 	this._delayInterval = (opt_ms != null) ? opt_ms : 500;
 };
 
-/** @private
-* @description Pre-process columns options to support both composite and rt-grid backward compatible
-* @param {number} colIndex
-* @param {Object} options
-* @returns {Object}
-*/
-SortableTitlePlugin.prototype._prepareColumnOptions = function (colIndex, options) {
-	var t = this;
-	var column = options || {};
-	var colOption = {
-		"colIndex": colIndex,
-		"field": column["field"],
-		"sortable": !!t._sortableColumns
-	};
-
-	if (column["sortBy"] != null) { // composite grid option
-		colOption["sortable"] = !!column["sortBy"];
-		colOption["sortBy"] = column["sortBy"];
-	}
-	if (column["sortable"] != null) { // rt grid option
-		colOption["sortable"] = !!column["sortable"];
-	}
-
-	colOption["sortLogic"] = column["sortLogic"] || column["sortingLogic"] || column["sorter"]; // Originally, rt grid support option for sortLogic by column
-	colOption["sort"] = column["defaultSort"] || column["sort"]; // composite and rt grid option for default sort order
-	return colOption;
-};
-
 /** @private
 * @description Get initial sort from column option `defaultSort` or `sort`
 * @param {Object} options Core model object
 * @returns {Object}
 */
 SortableTitlePlugin.prototype._initialSortByColumnField = function (options) {
-	var t = this;
-	var columns = options["columns"] || [];
-	var initialSort = null;
-	for (var i = 0; i < columns.length; i++) {
-		var col = t._prepareColumnOptions(i, columns[i]);
-		var val = col["sort"];
-		if (val) {
-			initialSort = {
-				"colIndex": col["colIndex"],
-				"sortOrder": val
+	var columns = options["columns"];
+	var colCount = columns ?  columns.length : 0;
+	for (var i = 0; i < colCount; i++) {
+		var column = columns[i];
+		var sortOrder = column["defaultSort"] || column["sort"]; // composite and rt grid option for default sort order
+		if (sortOrder) {
+			// TODO: Support multi-column sorting
+			return {
+				"colIndex": i,
+				"sortOrder": sortOrder
 			};
 		}
 	}
-	return initialSort;
+	return null;
 };
 
 /** @private
@@ -1169,7 +1149,7 @@ SortableTitlePlugin.prototype._onClickTitle = function (grid, e) {
 	if(this._disabled) {
 		return;
 	}
-	if (e.detail === 2 && this._isDisableDoubleClickToSort) { // dblclick
+	if (e.detail === 2 && !this._dblClickAllowed) { // dblclick
 		if (this._clickTimer) {
 			clearTimeout(this._clickTimer);
 			this._clickTimer = 0;
@@ -1447,18 +1427,35 @@ SortableTitlePlugin.prototype._sortColumn = function (states, opt_arg) {
 SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 	var t = this;
 	var colIndex = e["colIndex"];
-	var context = e["context"];
-	var col = t._prepareColumnOptions(colIndex, context);
-	var field = col["sortBy"] || col["field"];
-	var logic = col["sortLogic"] || t._sortLogic[field];
+	var column = e["context"] || {};
+
+	var sortable = !!t._sortableColumns;
+	var field = column["field"];
+	var sortBy = column["sortBy"];
+
+	if (sortBy != null) { // composite grid option
+		sortable = !!sortBy;
+		field = sortBy;
+	}
+	if (column["sortable"] != null) { // rt grid option
+		sortable = !!column["sortable"];
+	}
+
+	var sortLogic = column["sortLogic"] || column["sortingLogic"] || column["sorter"]; // Originally, rt grid support option for sortLogic by column
+	if(!sortLogic) {
+		sortLogic = t._sortLogic[field];
+	}
+	if(typeof sortLogic !== "function") {
+		sortLogic = null;
+	}
 
-	var sortingSequence = context ? context["sortingSequence"] : null;
+	var sortingSequence = column["sortingSequence"];
 	if (sortingSequence != null && field) { // Make sure that column config does not affect grid level config
 		t.setSortingSequence(sortingSequence, field);
 	}
 
-	if (col["sortable"]) {
-		t.setColumnSortingField(colIndex, field, typeof logic === "function" ? logic : null);
+	if (sortable) { // TODO: Check if empty field should be sortable
+		t.setColumnSortingField(colIndex, field, sortLogic, column["rowSorting"]);
 	} else {
 		t.disableColumnSorting(colIndex, true);
 	}