@refinitiv-ui/efx-grid 6.0.76 → 6.0.78

package/lib/column-dragging/es6/ColumnDragging.js

@@ -538,11 +538,8 @@ ColumnDraggingPlugin.prototype._onDrag = function (e) {
 		e.dragBox = this._dragBox;
 		this._renderGuideline();
 		this._dispatch("drag", /** @type{!Object} */(e));
-	}
-	if(!this._noDragBox) {
-		var drop = this._dragUI.renderDragBox(e, this._clickedGrid);
-		if(!drop) { // can not be drop or not allow to drop or insertion
-			this._pos["cancel"] = true;
+		if(!this._noDragBox) {
+			this._dragUI.renderDragBox(e, this._clickedGrid);
 		}
 	}
 };
@@ -586,6 +583,9 @@ ColumnDraggingPlugin.prototype._onDragEnd = function (e) {
 		operationCancelled = true;
 	}
 
+	if(!this._noDragBox && this._dragBoxIcon.icon === "void") {
+		operationCancelled = true;
+	}
 	//When move to the right, the first position is the current one.
 	if (this._destColumn > this._startColumn) {
 		--this._destColumn;
@@ -698,6 +698,7 @@ ColumnDraggingPlugin.prototype._clearCache = function() {
 
 	this._clickedRow = -1;
 	this._clickedSection = this._clickedGrid = null;
+	this._dragBoxIcon.icon = null;
 };
 
 /** @private

package/lib/core/dist/core.js

@@ -7588,7 +7588,7 @@ Scrollbar.prototype._onMouseWheel = function (e) {
 		util._preventDefault(e);
 		return;
 	}
-	if(e.ctrlKey || e.altKey || e.shiftKey) { return; }
+	if(e.ctrlKey || e.altKey ) { return; }
 	if (!this.isActive()) { return; }
 
 	var delta = (this._vertical) ? e["deltaY"] : e["deltaX"];
@@ -19147,6 +19147,10 @@ DataView.prototype._collapsed = false;
 /** @private
 * @type {boolean}
 */
+DataView.prototype._collapsible = true;
+/** @private
+* @type {boolean}
+*/
 DataView.prototype._showOnlyFirstMember = false;
 /** @private
 * @type {boolean}
@@ -20597,7 +20601,7 @@ DataView.prototype._setCollapse = function(collapsed) {
 			}
 		}
 	} else if (this._isHeaderRowShown()) { // Only groups with visible group header can be expanded/collapsed
-		if (this._collapsed !== collapsed) {
+		if (this._collapsible && this._collapsed !== collapsed) {
 			this._collapsed = collapsed;
 			return true;
 		}
@@ -20671,6 +20675,20 @@ DataView.prototype.setDefaultCollapse = function(collapse) {
 DataView.prototype.getDefaultCollapse = function() {
 	return !!this._shared.defaultCollapse; // it can be null, convert to boolean
 };
+/**
+* @public
+* @return {boolean}
+*/
+DataView.prototype.isCollapsible = function() {
+	return this._collapsible;
+};
+/**
+* @public
+* @param {boolean=} bool=true, if set it to false, it will be enable collapsing
+*/
+DataView.prototype.disableCollapsing = function(bool) {
+	this._collapsible = !(bool !== false);
+};
 /** @private
 * @return {?Array.<string>}
 */
@@ -26109,7 +26127,7 @@ Core_Core.prototype._firstRendered = false;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.82";
+	return "5.1.84";
 };
 /** {@link ElementWrapper#dispose}
 * @override