fixed #146 part 2/2. Fixed #66, #59 entirely finally.

TonyGermaneri · Nov 4, 2018 · ff998b3 · ff998b3
1 parent c63a381
commit ff998b3
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 17 deletions.
diff --git a/build.txt b/build.txt
@@ -1 +1 @@
-2030
+2031
diff --git a/dist/canvas-datagrid.debug.js b/dist/canvas-datagrid.debug.js
diff --git a/dist/canvas-datagrid.debug.map b/dist/canvas-datagrid.debug.map
diff --git a/dist/canvas-datagrid.js b/dist/canvas-datagrid.js
diff --git a/dist/canvas-datagrid.map b/dist/canvas-datagrid.map
diff --git a/lib/events.js b/lib/events.js
@@ -1159,12 +1159,21 @@ define([], function () {
             l = clipData.length;
             clipData.forEach(function (rowData) {
                 yi += 1;
-                var i = self.orders.columns[yi];
+                var i = self.orders.rows[yi];
                 self.data[i] = normalizeRowData(rowData, self.data[i], x, s, mimeType, i);
             });
             self.selections = sel;
             return l;
         };
+        self.getNextVisibleColumnIndex = function (visibleColumnIndex) {
+            var x, s = self.getVisibleSchema();
+            for (x = 0; x < s.length; x += 1) {
+                if (s[x].columnIndex === visibleColumnIndex) {
+                    return s[x + 1].columnIndex;
+                }
+            }
+            return -1;
+        };
         self.getVisibleColumnIndexOf = function (columnIndex) {
             var x, s = self.getVisibleSchema();
             for (x = 0; x < s.length; x += 1) {

diff --git a/lib/publicMethods.js b/lib/publicMethods.js
@@ -714,17 +714,26 @@ define([], function () {
             sel.forEach(function (row, index) {
                 if (index === l) { return; }
                 if (row.length === 0) { return; }
-                row.forEach(function (col) {
-                    if (!s[col]) { return; }
+                row.forEach(function (colIndex) {
+                    // intentional redef of colIndex
+                    colIndex = self.getVisibleColumnIndexOf(colIndex);
+                    if (!s[colIndex]) { return; }
                     if (!self.data[index]) { self.data[index] = {}; }
-                    self.data[index][s[col].name] = null;
+                    self.data[index][s[colIndex].name] = null;
                 });
             });
             sel.forEach(function (row, index) {
+                var lastSourceIndex;
                 yi += 1;
-                xi = x - 1;
+                xi = self.getVisibleColumnIndexOf(x);
                 row.forEach(function (col, cidx) {
-                    xi += 1;
+                    col = self.getVisibleColumnIndexOf(col);
+                    if (cidx > 0) {
+                        // this confusing bit of nonsense figures out
+                        // if the selection has skipped cells
+                        xi += col - lastSourceIndex;
+                    }
+                    lastSourceIndex = col;
                     if (col === -1
                             || !s[xi]
                             || !s[col]

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canvas-datagrid",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "description": "Canvas based data grid web component.  Capable of displaying millions of contiguous hierarchical rows and columns without paging or loading, on a single canvas element.",
   "main": "./dist/canvas-datagrid.js",
   "scripts": {