@refinitiv-ui/efx-grid 6.0.94 → 6.0.96

package/lib/rt-grid/es6/RowDefinition.js

@@ -367,14 +367,20 @@ RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 	let segmentId = "";
 	if(this._view) {
 		segmentId = this._view.getSegmentParentRowId(this._rowId);
-		if(this._isChain && segmentId){ // If the row was a normal row and has been changed to a chain, remove it from existing segment
-			let targetRowId = _getEndOfSegmentRowId(this._view, this._rowId);
-			this._view.removeSegmentChild(segmentId, this._rowId);
-			this._view.moveRow(this._rowId, targetRowId);
+		if(segmentId) {
+			if(this._isChain){ // If the row was a normal row and has been changed to a chain, remove it from existing segment
+				let targetRowId = _getEndOfSegmentRowId(this._view, this._rowId);
+				this._view.removeSegmentChild(segmentId, this._rowId);
+				this._view.moveRow(this._rowId, targetRowId);
 
-			segmentId = "";
+				segmentId = "";
+			}
+		} else if(this._view.getSegment(this._rowId)) {
+			this._view.setSegmentSeparator(this._rowId, false); // Remove existing segment
+		}
+		if(this._isChain) {
+			this._view.setSegmentSeparator(this._rowId, true);
 		}
-		this._view.setSegmentSeparator(this._rowId, !!this._isChain);
 		if(this.isChainCollapsed()) {
 			if(this._expanded){
 				this.expandChain();
@@ -956,7 +962,7 @@ RowDefinition.prototype.registerToView = function(view, rowId) {
 		if(!this._expanded) {
 			this.collapseChain();
 		}
-	} else if(parentRowId) {
+	} else if(!this._parent && parentRowId) { // Constituent cannot be added to another segment
 		view.addSegmentChild(parentRowId, this._rowId, this._dataId);
 	}
 };
@@ -1049,13 +1055,15 @@ RowDefinition.prototype.addConstituent = function(ric) {
 		let rowId = this.getRowId();
 		// WARNING: insert position, we prioritize using CHILD_ORDER (From server) in dc first. If it does not exist, the last row of the segment will be pushed
 		let childOrder = childDef.getData("CHILD_ORDER");
-		let parentIndex =  this._view.getRowIndex(rowId);
+		let dt = this._view.getDataSource();
+
+		let parentIndex = dt.getRowIndex(rowId);
 		let position =  parentIndex + this.getChildCount(); // push the last position
 		if(childOrder != null) {
 			// Warning: We need to carry a value of 1 because the CHILD_ORDER starts with 0, and it will be added to the parentIndex. In case the parent rowIndex is not included.
 			position = parentIndex + childOrder + 1; // insert between segment
 		} // else {} it will be push in the last row of segment
-		childDef.registerToView(this._view, this._view.getRowId(position));
+		childDef.registerToView(this._view, dt.getRowId(position));
 		// TODO: Handle nested children
 		this._view.addSegmentChild(rowId, childDef.getRowId(), childDef.getDataId());
 	}

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

@@ -1357,6 +1357,7 @@ CheckboxPlugin.prototype._onCheckboxChanged = function (e, toggling) {
 	if(toggling) {
 		newState = CheckboxPlugin._toggleState(newState);
 	}
+	let checked = newState !== "unchecked";
 
 	let host = this._hosts[0];
 	let pos = host.getRelativePosition(e); // Getting row index
@@ -1394,7 +1395,6 @@ CheckboxPlugin.prototype._onCheckboxChanged = function (e, toggling) {
 			}
 		}
 
-		let checked = newState !== "unchecked";
 		if(changeRange) {
 			this.setCheckStates(changeRange, !e.altKey);
 		} else {