@refinitiv-ui/efx-grid 6.0.76 → 6.0.78

package/lib/tr-grid-checkbox/es6/Checkbox.js

@@ -54,10 +54,13 @@ var CheckboxPlugin = function (options) {
 	t._onPreSectionRender = t._onPreSectionRender.bind(t);
 	t._onPostSectionDataBinding = t._onPostSectionDataBinding.bind(t);
 	t._onCheckboxClicked = t._onCheckboxClicked.bind(t);
+	t._onCheckboxKeydown = t._onCheckboxKeydown.bind(t);
+	t._onCheckboxMousedown = t._onCheckboxMousedown.bind(t);
 	t._onColumnIndexChanged = t._onColumnIndexChanged.bind(t);
 	t._onColumnAdded = t._onColumnAdded.bind(t);
 	t._requestUIPopulation = t._requestUIPopulation.bind(t);
 	t._populateUIs = t._populateUIs.bind(t);
+	t._isCheckboxDisabled = t._isCheckboxDisabled.bind(t);
 	t.selectAll = t.selectAll.bind(t);
 	t.deselectAll = t.deselectAll.bind(t);
 	t._hosts = [];
@@ -68,6 +71,84 @@ var CheckboxPlugin = function (options) {
 };
 Ext.inherits(CheckboxPlugin, GridPlugin);
 
+/** @type {Function}
+* @private
+*/
+CheckboxPlugin._emptyFunc = function () { };
+/** @private
+* @function
+* @param {Object} view DataView object
+* @param {string} rid
+* @return {boolean}
+*/
+CheckboxPlugin._isRowExpansion = function (view, rid) {
+	return view.isRowExpansion(rid); // WARNING: isRowExpansion() is available only in DataView and not DataTable
+};
+/** @private
+* @function
+* @param {Object} view DataView object
+* @param {Function} disablingGetter
+* @param {string} rid
+* @return {boolean}
+*/
+CheckboxPlugin._checkableRow = function (view, disablingGetter, rid) {
+	if(disablingGetter(view, rid)) {
+		return false;
+	}
+	if(CheckboxPlugin._isRowExpansion(view, rid)) {
+		return false;
+	}
+	return true;
+};
+/** @private
+* @function
+* @param {Element} elem
+*/
+CheckboxPlugin._addDisabledProp = function (elem) {
+	elem.setAttribute("disabled", "");
+};
+/** @private
+* @function
+* @param {Element} elem
+*/
+CheckboxPlugin._removeDisabledProp = function (elem) {
+	elem.removeAttribute("disabled");
+};
+/** @private
+* @function
+* @param {Element} elem
+* @param {string} prop
+* @param {boolean} bool
+*/
+CheckboxPlugin._setBooleanProp = function (elem, prop, bool) {
+	if(bool) {
+		elem.setAttribute(prop, "");
+	} else {
+		elem.removeAttribute(prop);
+	}
+};
+/** Collect member row that is in the given view and all members in collapsed group.
+* @private
+* @param {Object} dv DataView object
+* @param {!Array.<string>} rids
+* @param {string} rid
+* @return {!Array.<string>} rids
+*/
+CheckboxPlugin._collectRowMemberId = function (dv, rids, rid) {
+	if(rid) {
+		var subGroup = dv.getGroupByRowId(rid);
+		if(subGroup) {
+			if(subGroup.isCollapsed()) {
+				return rids.concat(subGroup.getAllRowIds(true));
+			}
+		} else {
+			rids.push(rid);
+		}
+	}
+	return rids;
+};
+
+
 /** @type {number}
 * @private
 */
@@ -108,10 +189,12 @@ CheckboxPlugin.prototype._autoRowSelection = false;
 * @private
 */
 CheckboxPlugin.prototype._topCheckboxHandler = true;
-/** @type {Function}
+/** @type {string}
 * @private
 */
-CheckboxPlugin._emptyFunc = function () { };
+CheckboxPlugin.prototype._anchorRowId = "";
+
+
 /** @type {Object.<string, number>}
 * @private
 */
@@ -250,17 +333,6 @@ CheckboxPlugin._mergeStates = function(states) {
 	}
 	return state;
 };
-/** @private
-* @function
-* @param {number} count
-* @param {boolean} bool
-* @return {Array.<boolean>}
-*/
-CheckboxPlugin._genData = function (count, bool) {
-	var data = new Array(count);
-	for(var i = count; --i >= 0;) { data[i] = bool; }
-	return data;
-};
 
 /** @public
 * @return {string}
@@ -632,6 +704,8 @@ CheckboxPlugin.prototype._createCheckbox = function (sectionSettings, colIndex,
 	chkbox._chkbox = true;
 
 	chkbox.addEventListener("click", this._onCheckboxClicked, false);
+	chkbox.addEventListener("keydown", this._onCheckboxKeydown, false);
+	chkbox.addEventListener("mousedown", this._onCheckboxMousedown, false);
 	// chkbox.addEventListener("checked-changed", this._onCheckboxClicked, false); // Elf v3
 
 	cell.setContent(chkbox);
@@ -660,19 +734,70 @@ CheckboxPlugin.prototype._createCheckbox = function (sectionSettings, colIndex,
 };
 
 
-/** Select all checkboxes that are not affected by filtering and pagination logics. This is equivalent to ticking the checkbox at the top header section of the grid
+/** Select/check all checkboxes that are not affected by filtering and pagination logics. This is equivalent to ticking the checkbox at the top header section of the grid
 * @public
 */
 CheckboxPlugin.prototype.selectAll = function () {
 	this.checkAll(true);
 };
-/** Deselect all checkboxes that are not affected by filtering and pagination logics. This is equivalent to un-ticking the checkbox at the top header section of the grid
+/** Deselect/uncheck all checkboxes that are not affected by filtering and pagination logics. This is equivalent to un-ticking the checkbox at the top header section of the grid
 * @public
 * @param {boolean} check
 */
 CheckboxPlugin.prototype.deselectAll = function () {
 	this.checkAll(false);
 };
+/** Select/check all spicified content checkboxes that are in view
+* @public
+* @param {Array.<number|string>} rowRefs
+* @param {boolean} checked
+*/
+CheckboxPlugin.prototype.selectCheckboxes = function (rowRefs) {
+	this.setCheckStates(rowRefs, true);
+};
+/** Select/check all spicified content checkboxes that are in view
+* @public
+* @param {Array.<number|string>} rowRefs
+* @param {boolean} checked
+*/
+CheckboxPlugin.prototype.deselectCheckboxes = function (rowRefs) {
+	this.setCheckStates(rowRefs, false);
+};
+/** Set check state to all spicified content checkboxes that are in view
+* @public
+* @param {Array.<number|string>} rowRefs
+* @param {boolean} checked
+*/
+CheckboxPlugin.prototype.setCheckStates = function (rowRefs, checked) {
+	if(!rowRefs) {
+		return;
+	}
+	var ary = Array.isArray(rowRefs) ? rowRefs : [rowRefs];
+	var len = ary.length;
+	if(!len) {
+		return;
+	}
+
+	// TODO: Support multi-table mode
+	var host = this._hosts[0];
+	var sectionSettings = host.getSectionSettings("content");
+	var dv = sectionSettings.getDataSource();
+	if(!dv) {
+		return;
+	}
+
+	var rids = [];
+	var i;
+	for (i = 0; i < len; ++i) {
+		var ref = ary[i];
+		var rid = (typeof ref === "string") ? ref : dv.getRowId(ref);
+		rids = CheckboxPlugin._collectRowMemberId(dv, rids, rid);
+	}
+	if(rids.length) {
+		rids = rids.filter(CheckboxPlugin._checkableRow.bind(null, dv, this._isCheckboxDisabled));
+		this._setColumnData(dv, this._checkboxField, checked, rids);
+	}
+};
 
 /** This is equivalent to clicking the checkbox at the top header section of the grid. <br>
 * Use {@link CheckboxPlugin#setAllCheckStates} to set all states regardless of filtering and pagination
@@ -710,9 +835,9 @@ CheckboxPlugin.prototype.setAllCheckStates = function (checked) {
 	var dt = dv ? dv.getDataSource() : null;
 
 	if(dt) {
-		var valueList = CheckboxPlugin._genData(dt.getRowCount(), checked);
-		var rids = dt.getAllRowIds();
-		this._setColumnData(dv, this._checkboxField, valueList, rids);
+		// TODO: Check if we need to omit disabled checkboxes
+		var rids = dt.getAllRowIds(true); // TODO: Check if we can use shallow copy
+		this._setColumnData(dv, this._checkboxField, checked, rids);
 	}
 };
 
@@ -722,27 +847,17 @@ CheckboxPlugin.prototype.setAllCheckStates = function (checked) {
 * @see {@link CheckboxPlugin#checkAll}
 */
 CheckboxPlugin.prototype.selectAllPages = function (checked) {
-	var state = checked != null ? checked : true;
 	var host = this._hosts[0];
 	var dv = host ? host.getDataSource() : null;
-
-	if(dv) {
-		var allRids = dv.getSortedRowIds(true);  // All row ids with filter applied, including disabled and pagination
-
-		// remove disabled row
-		var rids = [];
-		var dataRows = dv.getMultipleRowData(allRids);
-		var len = dataRows.length;
-		var dataRow;
-		for(var i = 0; i < len; i++) {
-			dataRow = this._rowGetter(dataRows[i]);
-			if(dataRow && !dataRow[this._disablingField]) {
-				rids.push(allRids[i]);
-			}
-		}
-		var valueList = CheckboxPlugin._genData(rids.length, state);
-		this._setColumnData(dv, this._checkboxField, valueList, rids);
+	if(!dv) {
+		return;
 	}
+
+	var allRids = dv.getSortedRowIds(true);  // All row ids with filter applied, including disabled and pagination
+	allRids = allRids.filter(CheckboxPlugin._checkableRow.bind(null, dv, this._isCheckboxDisabled));
+
+	var state = checked != null ? checked : true;
+	this._setColumnData(dv, this._checkboxField, state, allRids);
 };
 
 /** @public
@@ -765,6 +880,18 @@ CheckboxPlugin.prototype.disableCheckbox = function(rowRef, disabled) {
 
 	this._setData(dv, rowRef, this._disablingField, disabled !== false);
 };
+/** @private
+* @param {Object} view DataView object
+* @param {string} rowId in the data table or row index
+* @returns {boolean} disabled Truthy or Falsy value
+*/
+CheckboxPlugin.prototype._isCheckboxDisabled = function(view, rowId) {
+	var rowData = this._getRowFromId(view, rowId);
+	if(rowData) {
+		return rowData[this._disablingField] ? true : false;
+	}
+	return false;
+};
 
 /** @public
 * @param {number|string} rowRef Row id in the data table or row index
@@ -833,7 +960,6 @@ CheckboxPlugin.prototype.getFilteredSelectedData = function (field) {
 * @param {string=} field="" When field is not provided, entire rowData is returned. If field is specified, field values will be returned. Use "ROW_ID" as the field for retrieving internal row ids.
 * @return {!Array} Returns selected rows
 * @example
-* var chkBoxExtension = new CheckboxExtension();
 * chkBoxExtension.getSelectedRowData(); // Get all selected row data in this format [{}, {}, ... RowData objects, {}]
 * chkBoxExtension.getSelectedRowData("field"); // Get all field values from selected row data in this format [value1, value2, ... values, valueN]
 */
@@ -924,67 +1050,52 @@ CheckboxPlugin.prototype._getCheckboxValue = function (dv, rowId) {
 };
 /** @private
 * @param {Object} dv DataView
-* @return {Array.<string>} state
+* @return {string} state
 */
-CheckboxPlugin.prototype._getRowMemberIds = function (dv) {
-	var rowIds = [];
-	if (!dv) return rowIds;
+CheckboxPlugin.prototype._getGroupState = function (dv) {
+	if (!dv) {
+		return "unchecked";
+	}
 
-	if (dv.getGroupLevel && 0 === dv.getGroupLevel()) {
-		// case root group we check state from member that visible in view
+	var rowIds = null;
+	if (dv.getGroupLevel && dv.getGroupLevel() === 0) { // Root group
 		rowIds = this._getRowMemberIdsInView(dv);
-	} else {
-		// case dataTable or subGroup we check state from member in group
+	} else { // Subgroup
 		rowIds = dv.getAllRowIds(true); // Getting shallow copy and excluding header rows
+		rowIds = rowIds.filter(CheckboxPlugin._checkableRow.bind(null, dv, this._isCheckboxDisabled));
 	}
-	return rowIds;
-};
-/** @private
-* @param {Object} dv DataView
-* @return {string} state
-*/
-CheckboxPlugin.prototype._getGroupState = function (dv) {
-	if (!dv) return "unchecked";
 
-	var rowIds = this._getRowMemberIds(dv);
-
-	var dataRows = dv.getMultipleRowData(rowIds);
 	var len = rowIds.length;
-	if (0 === len) return "unchecked";
+	if (!len) {
+		return "unchecked";
+	}
 
-	var dataRow;
-	var states = [];
+	var state = "";
 	for(var i = 0; i < len; ++i) {
-		if (dv.getGroupByRowId(rowIds[i])) { continue; }
-		dataRow = dataRows[i];
-		if(dataRow && dataRow[this._disablingField]) {
-			continue;
-		}
-		states.push(CheckboxPlugin._toCheckState(this._getCheckboxValue(dv, rowIds[i])));
+		state = CheckboxPlugin._mergeState(
+			state,
+			CheckboxPlugin._toCheckState(this._getCheckboxValue(dv, rowIds[i]))
+		);
 	}
-	return CheckboxPlugin._mergeStates(states);
+	return state;
 };
 /** @private
 * @param {Object} dv DataView
 * @return {boolean} state
 */
 CheckboxPlugin.prototype._getGroupDisabledState = function (dv) {
-	if (!dv) return false;
+	if (!dv) {
+		return false;
+	}
 
-	var rowIds = this._getRowMemberIds(dv);
+	var rowIds = this._getRowMemberIdsInView(dv);
 	var len = rowIds.length;
-	if (!len) return true;
-
-	var disabled = true;
 	for(var i = 0; i < len; ++i) {
-		var rid = rowIds[i];
-		var dataRow = this._getRowFromId(dv, rid);
-		if (!dataRow[this._disablingField]) {
-			disabled = false;
-			break;
+		if(!this._isCheckboxDisabled(dv, rowIds[i])) {
+			return false;
 		}
 	}
-	return disabled;
+	return true;
 };
 /** @private
 * @param {Object} sectionSettings Grid sectionSettings object
@@ -1091,14 +1202,7 @@ CheckboxPlugin.prototype._syncAscendantState = function (sectionSettings, caller
 		var titleSection = host.getSectionSettings("title");
 		var disabled = this._getGroupDisabledState(dv);
 		var checkboxes = this._getAllCheckboxes(titleSection);
-		for(i = 0; i < checkboxes.length; i++){
-			var checkbox = checkboxes[i];
-			if(disabled) {
-				checkbox.setAttribute("disabled", "");
-			} else {
-				checkbox.removeAttribute("disabled");
-			}
-		}
+		checkboxes.forEach(disabled ? CheckboxPlugin._addDisabledProp : CheckboxPlugin._removeDisabledProp);
 	}
 
 	this._setSectionState(parent, state);
@@ -1109,51 +1213,18 @@ CheckboxPlugin.prototype._syncAscendantState = function (sectionSettings, caller
 * @param {string} state
 */
 CheckboxPlugin.prototype._setSectionState = function (sectionSettings, state) {
-	var i;
 	if (!state) {
 		return;
 	}
 
 	if (this._isDataBound(sectionSettings)) {
+		var checked = (state !== "unchecked");
 		var dv = /** @type{DataView} */(sectionSettings.getDataSource());
-
-		// create row dict and mark unchecked
-		var rowIdDict = {};
-		// in state !== unchecked we will get filtered row in group
-		// and set rowIdDict[checkID] = true
-		var checkIDs = this._getRowMemberIdsInView(dv);
-		for (i = 0; i < checkIDs.length; i++) {
-			var checkID = checkIDs[i];
-
-			// there are header group rows in the case of paging and grouping
-			if (dv.getGroupByRowId(checkID)) { continue; }
-
-			var dataRow = this._getRowFromId(dv, checkID);
-			if (dataRow && dataRow[this._disablingField]) {
-				continue;
-			}
-
-			if (state === "unchecked") {
-				// TODO: This will not work in RT grid
-				rowIdDict[checkID] = false;
-			} else {
-				rowIdDict[checkID] = true;
-			}
-		}
-
-		// create data array and rowIds array
-		var data = [];
-		var allRowIDInGroup = [];
-		for (var rowID in rowIdDict) {
-			allRowIDInGroup.push(rowID);
-			data.push(rowIdDict[rowID]);
-		}
-
-		// finally set all data
-		this._setColumnData(dv, this._checkboxField, data, allRowIDInGroup);
+		var memberRids = this._getRowMemberIdsInView(dv);
+		this._setColumnData(dv, this._checkboxField, checked, memberRids);
 	} else {
 		var checkboxes = this._getAllCheckboxes(sectionSettings);
-		for (i = checkboxes.length; --i >= 0; ) {
+		for (var i = checkboxes.length; --i >= 0; ) {
 			CheckboxPlugin._setCheckState(checkboxes[i], state);
 		}
 	}
@@ -1266,26 +1337,24 @@ CheckboxPlugin.prototype._populateUIs = function () {
 	host.requestRowRefresh(); // For content
 	this._initializing = false;
 };
+
 /** @private
 * @param {Event} e
+* @param {boolean=} toggling
 */
-CheckboxPlugin.prototype._onCheckboxClicked = function (e) {
-	if(this._coralCheckboxVer === 1) {
-		// Workaround for duplicate event from ef-checkbox
-		if(e.target.tagName === "LABEL") {
-			return;
-		}
+CheckboxPlugin.prototype._onCheckboxChanged = function (e, toggling) {
+	var chkbox = e ? /** @type{Element} */(e.currentTarget) : null;
+	if(!chkbox) {
+		return;
 	}
 
-	var chkbox = /** @type{Element} */(e.currentTarget);
-
 	// after checkbox change by user clicked action
 	// the checkbox state is change only 'unchecked' or 'checked' only
 	// so we must remove 'square-shape' class that use in only 'partial' state
 	chkbox.classList.remove('square-shape');
 
 	var newState = CheckboxPlugin._getCheckState(chkbox);
-	if(this._coralCheckboxVer === 1) { // State of the ef-checkbox will not be reflected immediately after click
+	if(toggling) {
 		newState = CheckboxPlugin._toggleState(newState);
 	}
 
@@ -1297,41 +1366,49 @@ CheckboxPlugin.prototype._onCheckboxClicked = function (e) {
 	}
 
 	if (this._isDataBound(sectionSettings)) {
-		var rowIndex = pos["rowIndex"];
-		var bool = newState !== "unchecked";
 		var dv = sectionSettings.getDataSource();
+		var rowIndex = pos["rowIndex"];
 		var rid = dv.getRowId(rowIndex);
-		var dataRow = this._getRowFromId(dv, rid);
-		if(dataRow) {
-			if (dataRow[this._disablingField]) {
-				return;
-			}
-			this._setData(dv, rowIndex, this._checkboxField, bool);
-		} else { // Group header
-			var subGroup = dv.getGroupByRowId(rid);
-			if (subGroup) {
-				// prepare data for _setColumnData fn.
-				var rowMemberIds = this._getRowMemberIdsOfGroupInView(dv, subGroup);
-				var len = rowMemberIds.length;
-
-				var dataRows = dv.getMultipleRowData(rowMemberIds);
-				var rids = [];
-				var data = [];
-				for (var i = 0; i < len; i++) {
-					dataRow = dataRows[i];
-					if (dataRow && dataRow[this._disablingField]) {
-						continue;
+
+		if(this._isCheckboxDisabled(dv, rid)) { // TODO: Check if this is necessary
+			return;
+		}
+
+
+		var changeRange = null;
+		if(e.shiftKey && this._anchorRowId) { // Select/deselect range of checkboxes
+			var prevIndex = dv.getRowIndex(this._anchorRowId);
+			if(prevIndex >= 0) {
+				var i;
+				if(prevIndex < rowIndex) {
+					changeRange = [];
+					for(i = prevIndex; i <= rowIndex; ++i) {
+						changeRange.push(i);
+					}
+				} else if(rowIndex < prevIndex) {
+					changeRange = [];
+					for(i = rowIndex; i <= prevIndex; ++i) {
+						changeRange.push(i);
 					}
-					rids.push(rowMemberIds[i]);
-					data.push(bool);
 				}
+			}
+		}
 
-				this._setColumnData(dv, this._checkboxField, data, rids);
+		if(changeRange) {
+			this.setCheckStates(changeRange, !e.altKey);
+		} else {
+			var bool = newState !== "unchecked";
+			var subGroup = dv.getGroupByRowId(rid);
+			if (subGroup) {
+				var rowMemberIds = this._getRowMemberIdsOfSubgroup(dv, subGroup);
+				this._setColumnData(dv, this._checkboxField, bool, rowMemberIds);
 
 				// WORKAROUND: to force group move to next state from partial state
 				if (newState === 'checked' && chkbox._prevState === 'partial') {
 					chkbox._forceNewState = newState;
 				}
+			} else {
+				this._setData(dv, rowIndex, this._checkboxField, bool);
 			}
 		}
 	}
@@ -1348,107 +1425,97 @@ CheckboxPlugin.prototype._onCheckboxClicked = function (e) {
 
 	e.stopPropagation();
 };
+/** @private
+* @param {Event} e
+*/
+CheckboxPlugin.prototype._onCheckboxClicked = function (e) {
+	var v1 = this._coralCheckboxVer === 1;
+	if(v1) {
+		// Workaround for duplicate event from ef-checkbox
+		if(e.target.tagName === "LABEL") {
+			return;
+		}
+	}
+
+	// State of the ef-checkbox will not be reflected immediately after click in ELF v1
+	this._onCheckboxChanged(e, v1);
+};
+/** @private
+* @param {Event} e
+*/
+CheckboxPlugin.prototype._onCheckboxKeydown = function (e) {
+	if(e.keyCode === 32) {
+		this._onCheckboxChanged(e, true);
+		e.preventDefault();
+	}
+};
+/** @private
+* @param {Event} e
+*/
+CheckboxPlugin.prototype._onCheckboxMousedown = function (e) {
+	if(!e.shiftKey) {
+		this._anchorRowId = "";
+		var host = this._hosts[0];
+		var pos = host.getRelativePosition(e.currentTarget);
+		if(pos.sectionType === "content") {
+			var dv = host.getDataSource();
+			this._anchorRowId = dv.getRowId(pos.rowIndex);
+		}
+	}
+};
 
 /** get member items in view. the items in view are items on current page and already filtered , include items in collapsed group
 * @private
-* @param {Object} view dataview object
-* @param {Object} targetGroup dataview object
+* @param {Object} view Root DataView object
+* @param {Object} targetGroup Subgroup DataView object
 * @return {!Array.<string>} list of row member ids of group in view
 */
-CheckboxPlugin.prototype._getRowMemberIdsOfGroupInView = function (view, targetGroup) {
-	var visibleRowIds = view.getVisibleRowIds(true);
-	var beginPos = 0;
+CheckboxPlugin.prototype._getRowMemberIdsOfSubgroup = function (view, targetGroup) {
+	var memberIds = this._getRowMemberIdsInView(view); // Slow
 
-	// if group header is in view and collapsed we can return all id in view immediately
-	var pos = visibleRowIds.indexOf(targetGroup.getGroupRowId());
-	if (pos >= 0) {
-		if (targetGroup.isCollapsed()) return targetGroup.getAllRowIds(true);
-		else beginPos = pos + 1;
-	} else { // not support case group header not in view or inside group parent that collapsed
-		return [];
-	}
-
-	// loop to check which member is in view
-	var groupVisibleRowIds = targetGroup.getVisibleRowIds(true);
-	var result = [], id, childGroup, i;
-	var len = groupVisibleRowIds.length;
-	for (i = 0; i < len; i++) {
-		id = groupVisibleRowIds[i];
-		pos = visibleRowIds.indexOf(id, beginPos);
+	// WARNING: Subgroup header row may not be in the view
+	var subgroupMembers = targetGroup.isCollapsed() ? targetGroup.getAllRowIds(true) : targetGroup.getVisibleRowIds(true);
+	var beginPos = 0;
+	var result = [];
+	var len = subgroupMembers.length;
+	// TODO: Use object map instead of indexOf for checking
+	for (var i = 0; i < len; i++) {
+		var subgroupMember = subgroupMembers[i];
+		var pos = memberIds.indexOf(subgroupMember, beginPos);
 		if (pos >= 0) {
 			beginPos = pos + 1;
-			childGroup = view.getGroupByRowId(id);
-			if (childGroup) {
-				if (childGroup.isCollapsed()) {
-					// child group collapsed then all rows in childGroup are in view
-					result = result.concat(childGroup.getAllRowIds(true) || []);
-				}
-			} else {
-				result.push(id);
-			}
+			result.push(subgroupMember);
 		}
 	}
 
 	return result;
 };
 
-/** @private
-* @param {Object} view dataview or datatable object
+/** Get all member rows that are in the given view and all members in a collapsed group. This excludes group header row ids.
+* Only valid row ids are returned. Row expansions and disabled rows are excluded.
+* @private
+* @param {Object} view DataView or DataTable object
 * @return {!Array.<string>} list of row member ids in view
 */
 CheckboxPlugin.prototype._getRowMemberIdsInView = function (view) {
-	// 1. get All member and group rowIds
-	// 2. loop check whether rowIds is group or just row member
-	// 3. if rowId is not group then it's just a row member
-	// 4. in case rowId is group and collapsed we will get all member rowIds of group and add to memberRowIds
-
 	if (view.getDataSource()) { // check is dataView
 		// TODO: support multi-level grouping
 		// if view is DataView -> view.getVisibleRowIds(true) will get member and group rowIds in view
-		var rids = view.getVisibleRowIds(true);
+		var rids = view.isCollapsed() ? view.getAllRowIds(true) : view.getVisibleRowIds(true); // get All member and group rowIds
 		var len = rids.length;
 		var allRids = [];
-		var rid, group, i;
-		for (i = 0; i < len; i++) { // 2
-			rid = rids[i];
-			group = view.getGroupByRowId(rid);
-			if (!group) {
-				allRids.push(rid); // 3
-			} else if (group.isCollapsed()) { // 4
-				allRids = allRids.concat(group.getAllRowIds(true) || []);
-			}
+		for (var i = 0; i < len; i++) { // loop check whether rowIds is group or just row member
+			allRids = CheckboxPlugin._collectRowMemberId(view, allRids, rids[i]);
 		}
 
-		// remove disabled row
-		rids = [];
-		var dataRows = view.getMultipleRowData(allRids);
-		len = dataRows.length;
-		var dataRow;
-		for(i = 0; i < len; i++) {
-			dataRow = dataRows[i];
-			if(dataRow && dataRow[this._disablingField]) {
-				continue;
-			}
-			rids.push(allRids[i]);
-		}
 		// if view is DataView, the intention is to get data with applied filter/hidden. row expansion should also filtered out.
-		return rids.filter(this._isNotRowExpansion.bind(null, view));
+		return allRids.filter(CheckboxPlugin._checkableRow.bind(null, view, this._isCheckboxDisabled));
 	} else {
 		// if view is DataTable -> view.getAllRowIds(true) will get all member in grid regardless of hidden/filtered state.
 		return view.getAllRowIds(true);
 	}
 };
 
-/** @private
-* @param {Object} view DataView object
-* @param {string} rid
-* @return {boolean}
-*/
-CheckboxPlugin.prototype._isNotRowExpansion = function (view, rid) {
-	// NOTE: isRowExpansion() is only available in DataView.
-	return !view.isRowExpansion(rid);
-};
-
 /** @private
 * @param {Object} e
 */
@@ -1533,7 +1600,7 @@ CheckboxPlugin.prototype._onPostSectionDataBinding = function (e) {
 			chkbox = checkboxes[i] = this._createCheckbox(sectionSettings, this._displayColumn, rowIndex);
 		}
 		var rowId = dv.getRowId(rowIndex); // Slow
-		rowData = this._rowGetter(dv.getRowData(rowId));
+		rowData = this._getRowFromId(dv, rowId);
 		if(hasBinding && chkbox) {
 			arg["checkbox"] = chkbox;
 			arg["rowIndex"] = rowIndex;
@@ -1556,11 +1623,7 @@ CheckboxPlugin.prototype._onPostSectionDataBinding = function (e) {
 		}
 
 		if(chkbox) {
-			if(disabled) {
-				chkbox.setAttribute("disabled", "");
-			} else {
-				chkbox.removeAttribute("disabled");
-			}
+			CheckboxPlugin._setBooleanProp(chkbox, "disabled", disabled);
 			CheckboxPlugin._setCheckState(chkbox, state);
 		}
 	}
@@ -1569,5 +1632,6 @@ CheckboxPlugin.prototype._onPostSectionDataBinding = function (e) {
 };
 
 
+
 export default CheckboxPlugin;
 export { CheckboxPlugin, CheckboxPlugin as Checkbox, CheckboxPlugin as CheckboxExtension };