@refinitiv-ui/efx-grid 6.0.150 → 6.0.151

package/lib/formatters/es6/EFRadioButtonFormatter.js

@@ -5,21 +5,76 @@ import FormatterBuilder from "./FormatterBuilder.js";
 * @property {number=} initialIndex
 */
 
+/** @private
+* @function
+* @param {number|string} rowRef
+* @param {boolean=} checked
+* @returns {boolean} Returns true if there is a change
+*/
+let _selectRadio = function (rowRef, checked) {
+	if(!this.grid) {
+		return false;
+	}
+	let dv = this.grid.getDataSource();
+	if(!dv) {
+		return false;
+	}
+
+	let rowIndex = -1;
+	let rid = "";
+	if(typeof rowRef == "string") {
+		rid = rowRef;
+		rowIndex = dv.getRowIndex(rid);
+	} else {
+		rowIndex = rowRef;
+		rid = dv.getRowId(rowIndex);
+	}
+	if(!(rowIndex >= 0) || !rid) {
+		return false;
+	}
+
+	let dirty = false;
+	if (checked !== false) {
+		if (this.previousId && this.previousId !== rid) {
+			this.rowIndex = dv.getRowIndex(this.previousId);
+			this.setData(this.field, false);
+		}
+		this.rowIndex = rowIndex;
+		this.previousId = rid;
+		this.setData(this.field, true);
+		this.value = checked;
+		dirty = true;
+	} else if(this.previousId == rid) {
+		this.rowIndex = rowIndex;
+		this.previousId = "";
+		this.setData(this.field, false);
+		this.value = false;
+		dirty = true;
+	}
+	return dirty;
+};
+
 /** @private
 * @function
 * @param {Element} element
 * @param {Object} ctx
 */
 let onElementCreated = function (element, ctx) {
-	let dv = ctx.grid.getDataSource();
-	let rid = dv.getRowId(ctx.rowIndex);
-	let index = dv.getRowIndex(rid);
-	let checked = index === ctx.initialIndex;
+	let checked = false;
+	let rid = "";
+	if(ctx.initialIndex >= 0) {
+		let dv = ctx.grid.getDataSource();
+		rid = dv.getRowId(ctx.rowIndex);
+		if(!ctx.initialRid) {
+			ctx.initialRid = dv.getRowId(ctx.initialIndex);
+		}
+		checked = (rid === ctx.initialRid);
+	}
 	if (checked) {
 		ctx.previousId = rid;
 		ctx.setData(ctx.field, checked);
+		ctx.value = checked;
 	}
-	ctx.value = checked;
 };
 
 /** @private
@@ -28,9 +83,10 @@ let onElementCreated = function (element, ctx) {
 * @param {Object} ctx
 */
 let onElementUpdated = function (element, ctx) {
-	let dv = ctx.grid.getDataSource();
-	let rid = dv.getRowId(ctx.rowIndex);
-	let checked = (rid === ctx.previousId) && ctx.value;
+	let checked = ctx.value ? true : false;
+	if(checked) {
+		checked = (ctx.grid.getDataSource().getRowId(ctx.rowIndex) === ctx.previousId);
+	}
 	element.checked = checked;
 };
 
@@ -40,22 +96,7 @@ let onElementUpdated = function (element, ctx) {
 * @param {*} ctx
 */
 let _changeHandler = function (e, ctx) {
-	ctx.value = e.detail.value;
-	ctx.setData(ctx.field, ctx.value);
-
-	let dv = ctx.grid.getDataSource();
-	let rid = dv.getRowId(ctx.rowIndex);
-	if (ctx.previousId && ctx.previousId !== rid) {
-		let row = dv.getRowData(ctx.previousId);
-		if (row) {
-			if (row["ROW_DEF"]) {
-				row["ROW_DEF"].setData(ctx.field, false);
-			} else {
-				dv.setData(ctx.previousId, ctx.field, false);
-			}
-		}
-	}
-	ctx.previousId = dv.getRowId(ctx.rowIndex);
+	ctx.selectRadio(ctx.rowIndex, true);
 };
 
 /** @constructor
@@ -76,6 +117,7 @@ EFRadioButtonFormatter.create = function (options) {
 		styles: {
 			margin: 0
 		},
+		selectRadio: _selectRadio,
 		onElementCreated: onElementCreated,
 		onElementUpdated: onElementUpdated,
 		changeHook: "checked-changed",

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.150" };
+window.EFX_GRID = { version: "6.0.151" };

package/lib/versions.json

@@ -30,7 +30,7 @@
 	"tr-grid-rowcoloring": "1.0.26",
 	"tr-grid-textformatting": "1.0.49",
 	"tr-grid-titlewrap": "1.0.22",
-	"@grid/formatters": "1.0.55",
+	"@grid/formatters": "1.0.56",
 	"@grid/column-selection-dialog": "4.0.59",
 	"@grid/filter-dialog": "4.0.79",
 	"@grid/column-format-dialog": "4.0.45"

package/package.json

@@ -69,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.150"
+	"version": "6.0.151"
 }