From 573d0a2eb805e461bf8b43bb090841e629ec37fb Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Wed, 17 Mar 2021 16:24:03 +0800
Subject: [PATCH] Changed
 Roo/grid/GridDragZone.jsroojs-all.jsroojs-debug.jsroojs-ui-debug.jsroojs-ui.js

---
 Roo/grid/GridDragZone.js | 13 +++++++++++--
 roojs-all.js             |  7 ++++---
 roojs-debug.js           | 13 +++++++++++--
 roojs-ui-debug.js        | 13 +++++++++++--
 roojs-ui.js              |  7 ++++---
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/Roo/grid/GridDragZone.js b/Roo/grid/GridDragZone.js
index 1a596615c6..c62baab61f 100644
--- a/Roo/grid/GridDragZone.js
+++ b/Roo/grid/GridDragZone.js
@@ -45,7 +45,11 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
         
         }
         
-        if(rowIndex !== false){
+        var sels = sm.getSelections ? sm.getSelections() : (
+                    sm.getSelectedCell() ? [ this.grid.ds.getAt(sm.getSelectedCell()[0]) ] : []);
+        
+        // before it used to all dragging of unseleted... - now we dont do that.
+        if(sels){
             
             // if editorgrid.. 
             
@@ -72,7 +76,12 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
         }
         return false;
     },
-
+    
+    onBeforeDrag : function(data, e)
+    {
+        // if we dont have any data to drag - then cancel.
+        return data !== false;
+    },
     onInitDrag : function(e){
         var data = this.dragData;
         this.ddel.innerHTML = this.grid.getDragDropText();
diff --git a/roojs-all.js b/roojs-all.js
index b3a85aabd0..85d2eb9329 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2457,9 +2457,10 @@ var w=this.cm.getColumnWidth(this.cellIndex);var A=Math.max(w-this.grid.minColum
 // Roo/grid/GridDragZone.js
 Roo.grid.GridDragZone=function(A,B){this.view=A.getView();Roo.grid.GridDragZone.superclass.constructor.call(this,this.view.mainBody.dom,B);if(this.view.lockedBody){this.setHandleElId(Roo.id(this.view.mainBody.dom));this.setOuterHandleElId(Roo.id(this.view.lockedBody.dom));
 }this.scroll=false;this.grid=A;this.ddel=document.createElement('div');this.ddel.className='x-grid-dd-wrap';};Roo.extend(Roo.grid.GridDragZone,Roo.dd.DragZone,{ddGroup:"GridDD",getDragData:function(e){var t=Roo.lib.Event.getTarget(e);var A=this.view.findRowIndex(t);
-var sm=this.grid.selModel;if(sm.getSelectedCell){if(!sm.getSelectedCell()){return false;}if(A!=sm.getSelectedCell()[0]){return false;}}if(A!==false){if(e.hasModifier()){sm.handleMouseDown(e,t);}Roo.log("getDragData");return {grid:this.grid,ddel:this.ddel,rowIndex:A,selections:sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[])}
-;}return false;},onInitDrag:function(e){var A=this.dragData;this.ddel.innerHTML=this.grid.getDragDropText();this.proxy.update(this.ddel);},afterRepair:function(){this.dragging=false;},getRepairXY:function(e,A){return false;},onEndDrag:function(A,e){},onValidDrop:function(dd,e,id){this.hideProxy();
-},beforeInvalidDrop:function(e,id){}});
+var sm=this.grid.selModel;if(sm.getSelectedCell){if(!sm.getSelectedCell()){return false;}if(A!=sm.getSelectedCell()[0]){return false;}}var B=sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[]);if(B){if(e.hasModifier()){sm.handleMouseDown(e,t);
+}Roo.log("getDragData");return {grid:this.grid,ddel:this.ddel,rowIndex:A,selections:sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[])};}return false;},onBeforeDrag:function(A,e){return A!==false;},onInitDrag:function(e){var A=this.dragData;
+this.ddel.innerHTML=this.grid.getDragDropText();this.proxy.update(this.ddel);},afterRepair:function(){this.dragging=false;},getRepairXY:function(e,A){return false;},onEndDrag:function(A,e){},onValidDrop:function(dd,e,id){this.hideProxy();},beforeInvalidDrop:function(e,id){}
+});
 // Roo/grid/ColumnModel.js
 Roo.grid.ColumnModel=function(A){this.config=A;this.lookup={};for(var i=0,B=A.length;i<B;i++){var c=A[i];if(typeof c.dataIndex=="undefined"){c.dataIndex=i;}if(typeof c.renderer=="string"){c.renderer=Roo.util.Format[c.renderer];}if(typeof c.id=="undefined"){c.id=Roo.id();
 }if(c.editor&&c.editor.xtype){c.editor=Roo.factory(c.editor,Roo.grid);}if(c.editor&&c.editor.isFormField){c.editor=new Roo.grid.GridEditor(c.editor);}this.lookup[c.id]=c;}this.defaultWidth=100;this.defaultSortable=false;this.addEvents({"widthchange":true,"headerchange":true,"hiddenchange":true,"columnmoved":true,"columnlockchange":true}
diff --git a/roojs-debug.js b/roojs-debug.js
index a99790444e..3cac4b8f5a 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -58027,7 +58027,11 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
         
         }
         
-        if(rowIndex !== false){
+        var sels = sm.getSelections ? sm.getSelections() : (
+                    sm.getSelectedCell() ? [ this.grid.ds.getAt(sm.getSelectedCell()[0]) ] : []);
+        
+        // before it used to all dragging of unseleted... - now we dont do that.
+        if(sels){
             
             // if editorgrid.. 
             
@@ -58054,7 +58058,12 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
         }
         return false;
     },
-
+    
+    onBeforeDrag : function(data, e)
+    {
+        // if we dont have any data to drag - then cancel.
+        return data !== false;
+    },
     onInitDrag : function(e){
         var data = this.dragData;
         this.ddel.innerHTML = this.grid.getDragDropText();
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 234ddca854..a5a069e199 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -35022,7 +35022,11 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
         
         }
         
-        if(rowIndex !== false){
+        var sels = sm.getSelections ? sm.getSelections() : (
+                    sm.getSelectedCell() ? [ this.grid.ds.getAt(sm.getSelectedCell()[0]) ] : []);
+        
+        // before it used to all dragging of unseleted... - now we dont do that.
+        if(sels){
             
             // if editorgrid.. 
             
@@ -35049,7 +35053,12 @@ Roo.extend(Roo.grid.GridDragZone, Roo.dd.DragZone, {
         }
         return false;
     },
-
+    
+    onBeforeDrag : function(data, e)
+    {
+        // if we dont have any data to drag - then cancel.
+        return data !== false;
+    },
     onInitDrag : function(e){
         var data = this.dragData;
         this.ddel.innerHTML = this.grid.getDragDropText();
diff --git a/roojs-ui.js b/roojs-ui.js
index 9c5f4e9d60..ae29202996 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1563,9 +1563,10 @@ var w=this.cm.getColumnWidth(this.cellIndex);var A=Math.max(w-this.grid.minColum
 // Roo/grid/GridDragZone.js
 Roo.grid.GridDragZone=function(A,B){this.view=A.getView();Roo.grid.GridDragZone.superclass.constructor.call(this,this.view.mainBody.dom,B);if(this.view.lockedBody){this.setHandleElId(Roo.id(this.view.mainBody.dom));this.setOuterHandleElId(Roo.id(this.view.lockedBody.dom));
 }this.scroll=false;this.grid=A;this.ddel=document.createElement('div');this.ddel.className='x-grid-dd-wrap';};Roo.extend(Roo.grid.GridDragZone,Roo.dd.DragZone,{ddGroup:"GridDD",getDragData:function(e){var t=Roo.lib.Event.getTarget(e);var A=this.view.findRowIndex(t);
-var sm=this.grid.selModel;if(sm.getSelectedCell){if(!sm.getSelectedCell()){return false;}if(A!=sm.getSelectedCell()[0]){return false;}}if(A!==false){if(e.hasModifier()){sm.handleMouseDown(e,t);}Roo.log("getDragData");return {grid:this.grid,ddel:this.ddel,rowIndex:A,selections:sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[])}
-;}return false;},onInitDrag:function(e){var A=this.dragData;this.ddel.innerHTML=this.grid.getDragDropText();this.proxy.update(this.ddel);},afterRepair:function(){this.dragging=false;},getRepairXY:function(e,A){return false;},onEndDrag:function(A,e){},onValidDrop:function(dd,e,id){this.hideProxy();
-},beforeInvalidDrop:function(e,id){}});
+var sm=this.grid.selModel;if(sm.getSelectedCell){if(!sm.getSelectedCell()){return false;}if(A!=sm.getSelectedCell()[0]){return false;}}var B=sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[]);if(B){if(e.hasModifier()){sm.handleMouseDown(e,t);
+}Roo.log("getDragData");return {grid:this.grid,ddel:this.ddel,rowIndex:A,selections:sm.getSelections?sm.getSelections():(sm.getSelectedCell()?[this.grid.ds.getAt(sm.getSelectedCell()[0])]:[])};}return false;},onBeforeDrag:function(A,e){return A!==false;},onInitDrag:function(e){var A=this.dragData;
+this.ddel.innerHTML=this.grid.getDragDropText();this.proxy.update(this.ddel);},afterRepair:function(){this.dragging=false;},getRepairXY:function(e,A){return false;},onEndDrag:function(A,e){},onValidDrop:function(dd,e,id){this.hideProxy();},beforeInvalidDrop:function(e,id){}
+});
 // Roo/grid/ColumnModel.js
 Roo.grid.ColumnModel=function(A){this.config=A;this.lookup={};for(var i=0,B=A.length;i<B;i++){var c=A[i];if(typeof c.dataIndex=="undefined"){c.dataIndex=i;}if(typeof c.renderer=="string"){c.renderer=Roo.util.Format[c.renderer];}if(typeof c.id=="undefined"){c.id=Roo.id();
 }if(c.editor&&c.editor.xtype){c.editor=Roo.factory(c.editor,Roo.grid);}if(c.editor&&c.editor.isFormField){c.editor=new Roo.grid.GridEditor(c.editor);}this.lookup[c.id]=c;}this.defaultWidth=100;this.defaultSortable=false;this.addEvents({"widthchange":true,"headerchange":true,"hiddenchange":true,"columnmoved":true,"columnlockchange":true}
-- 
2.39.2