@refinitiv-ui/efx-grid 6.0.75 → 6.0.77

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"];
@@ -21688,7 +21688,7 @@ DataView.prototype._onDataChanged = function (e) {
 		var event = events[0];
 		if (event["globalChange"]) {
 			this._updateRowIds(); // Reset all row ids and perform sorting
-			this._dispatchDataChange(e);
+			this._dispatchDataChange(event);
 			return;
 		}
 
@@ -26109,7 +26109,7 @@ Core_Core.prototype._firstRendered = false;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.81";
+	return "5.1.83";
 };
 /** {@link ElementWrapper#dispose}
 * @override