canvas-datagrid 0.4.4 → 0.4.6

package/lib/intf.js

@@ -89,9 +89,7 @@ export default function (self, ctor) {
     columns: {},
     trees: {},
   };
-  self.selections = [];
-  self.selectedRows = [];
-  self.selectedColumns = [];
+  self.fillOverlay = {};
   self.filterable = {
     rows: [],
     columns: [],
@@ -215,185 +213,7 @@ export default function (self, ctor) {
     'wheel',
   ];
   self.mouse = { x: 0, y: 0 };
-  self.getSelectedData = function (expandToRow) {
-    const selectedData = [];
-    const schema = self.getSchema();
-    const viewDataLength = self.viewData.length;
 
-    if (viewDataLength === 0) {
-      return [];
-    }
-
-    // self.selections is a sparse array, so `viewRowIndex` here
-    // will equal the row index as where it's rendered,
-    // not as where it is in the original data array.
-    self.selections.forEach(function (row, viewRowIndex) {
-      if (!row) {
-        return;
-      }
-
-      if (viewRowIndex === viewDataLength) {
-        return;
-      }
-
-      if (row.length === 0) {
-        selectedData[viewRowIndex] = null;
-        return;
-      }
-
-      selectedData[viewRowIndex] = {};
-
-      row.forEach(function (col) {
-        if (col === -1 || !schema[col]) {
-          return;
-        }
-
-        const orderedIndex = self.orders.columns[col];
-
-        if (!expandToRow && schema[orderedIndex].hidden) {
-          return;
-        }
-
-        if (self.viewData[viewRowIndex]) {
-          selectedData[viewRowIndex][schema[orderedIndex].name] =
-            self.viewData[viewRowIndex][schema[orderedIndex].name];
-        }
-      });
-    });
-
-    return selectedData;
-  };
-  self.getSelectedCells = function (expandToRow) {
-    const selectedCells = [];
-    const schema = self.getSchema();
-    const viewDataLength = self.viewData.length;
-
-    if (viewDataLength === 0) {
-      return [];
-    }
-
-    for (const [viewRowIndex, row] of self.selections.entries()) {
-      if (!row || row.length === 0) continue;
-
-      for (const [, viewColumnIndex] of row.entries()) {
-        if (viewColumnIndex === -1 || !schema[viewColumnIndex]) {
-          continue;
-        }
-
-        const boundColumnIndex = self.getBoundColumnIndexFromViewColumnIndex(
-          viewColumnIndex,
-        );
-
-        if (!expandToRow && schema[boundColumnIndex].hidden) {
-          continue;
-        }
-
-        if (self.viewData[viewRowIndex]) {
-          const header = schema[boundColumnIndex];
-          const value = self.viewData[viewRowIndex][header.name];
-          const boundRowIndex = self.getBoundRowIndexFromViewRowIndex(
-            viewRowIndex,
-          );
-
-          const cell = {
-            value,
-            header,
-            boundRowIndex,
-            boundColumnIndex,
-            viewRowIndex,
-            viewColumnIndex,
-          };
-
-          selectedCells.push(cell);
-        }
-      }
-    }
-
-    return selectedCells;
-  };
-  self.copySelectedCellsToClipboard = function (clipboardData) {
-    const selectedData = [];
-    const schema = self.getSchema();
-    let firstRowAsString;
-    let isNeat = true; // Selected like [[0, 1], [0, 1]] of [[0, 3]] is neat; Selected like [[0, 1], [1, 2]] is untidy
-
-    for (const [rowIndex, row] of self.selections.entries()) {
-      // If no cells are selected for a particular rowIndex the selections array will contain an empty element for that rowIndex.
-      if (!row) continue;
-
-      // Convert to string for easy comparison to the first row.
-      const rowAsString = row.join(',').toString();
-      const rowDict = {};
-
-      if (!firstRowAsString) firstRowAsString = row.join(',').toString();
-      if (isNeat && rowAsString !== firstRowAsString) isNeat = false;
-
-      const boundRowIndex = self.getBoundRowIndexFromViewRowIndex(rowIndex);
-
-      for (let columnIndex of row) {
-        // If the whole row is selected the columnIndex for the rowHeader is -1.
-        if (columnIndex < 0) continue;
-
-        const boundColumnIndex = self.getBoundColumnIndexFromViewColumnIndex(
-          columnIndex,
-        );
-        const columnName = schema[boundColumnIndex].name;
-
-        const value = self.originalData[boundRowIndex][columnName];
-
-        rowDict[columnName] = value;
-      }
-      selectedData.push(rowDict);
-    }
-
-    if (selectedData.length > 0) {
-      const textString = createTextString(selectedData, isNeat);
-      const htmlString = createHTMLString(selectedData, isNeat);
-
-      const copiedData = {
-        'text/plain': textString,
-        'text/html': htmlString,
-        'text/csv': textString,
-        'application/json': JSON.stringify(selectedData),
-      };
-
-      for (const [mimeType, data] of Object.entries(copiedData)) {
-        clipboardData.setData(mimeType, data);
-      }
-    }
-  };
-  self.clearSelectedCells = function () {
-    const schema = self.getSchema();
-    const affectedCells = [];
-
-    for (const [rowIndex, row] of self.selections.entries()) {
-      // If no cells are selected for a particular rowIndex the selections array will contain an empty element for that rowIndex.
-      if (!row) continue;
-
-      const boundRowIndex = self.getBoundRowIndexFromViewRowIndex(rowIndex);
-
-      for (let columnIndex of row) {
-        // If the whole row is selected the columnIndex for the rowHeader is -1.
-        if (columnIndex < 0) continue;
-
-        const boundColumnIndex = self.getBoundColumnIndexFromViewColumnIndex(
-          columnIndex,
-        );
-        const columnName = schema[boundColumnIndex].name;
-
-        self.viewData[boundRowIndex][columnName] = '';
-
-        affectedCells.push([
-          rowIndex,
-          columnIndex,
-          boundRowIndex,
-          boundColumnIndex,
-        ]);
-      }
-    }
-
-    return affectedCells;
-  };
   self.getBoundRowIndexFromViewRowIndex = function (viewRowIndex) {
     if (self.boundRowIndexMap && self.boundRowIndexMap.has(viewRowIndex)) {
       return self.boundRowIndexMap.get(viewRowIndex);
@@ -581,27 +401,6 @@ export default function (self, ctor) {
   self.createRowOrders = function () {
     self.orders.rows = fillArray(0, self.originalData.length - 1);
   };
-  self.fitSelectedColumns = function (width) {
-    const selectedColumns = self.selections[0];
-    const schema = self.getSchema();
-
-    for (const selectedColumn of selectedColumns) {
-      // Make sure the column is not the row header and that the whole column has in fact been selected.
-      if (selectedColumn >= 0 && self.isColumnSelected(selectedColumn)) {
-        if (isNaN(width)) {
-          const column = schema[self.orders.columns[selectedColumn]];
-          self.fitColumnToValues(column.name);
-        } else {
-          self.sizes.columns[selectedColumn] = width;
-          self.dispatchEvent('resizecolumn', {
-            x: width,
-            y: self.resizingStartingHeight,
-            draggingItem: self.currentCell,
-          });
-        }
-      }
-    }
-  };
   self.getVisibleSchema = function () {
     return self.getSchema().filter(function (col) {
       return !col.hidden;
@@ -912,7 +711,11 @@ export default function (self, ctor) {
     self.eventParent.removeEventListener('click', self.click, false);
     self.eventParent.removeEventListener('mousemove', self.mousemove);
     self.eventParent.removeEventListener('wheel', self.scrollWheel, false);
-    self.canvas.removeEventListener('contextmenu', self.contextmenu, false);
+    self.canvas.removeEventListener(
+      'contextmenu',
+      self.contextmenuEvent,
+      false,
+    );
     self.canvas.removeEventListener('copy', self.copy);
     self.controlInput.removeEventListener('copy', self.copy);
     self.controlInput.removeEventListener('cut', self.cut);
@@ -1087,13 +890,7 @@ export default function (self, ctor) {
                   colTrees.push(self.cellTree.origin.columns[k][l]);
               } else collapsedColCount++;
             }
-            tempRow.push(
-              ...Array(collapsedColCount)
-                .fill()
-                .map(function () {
-                  return '';
-                }),
-            );
+            tempRow.push(...Array(collapsedColCount).fill(''));
             if (colTrees.length) {
               colTrees.push(
                 ...Array(collapsedColCount)
@@ -1113,13 +910,7 @@ export default function (self, ctor) {
           tempRow.push(self.viewData[k][l]);
         }
         otherData[k] = tempRow;
-        collapsed.push(
-          Array(self.viewData[0].length)
-            .fill()
-            .map(function () {
-              return '';
-            }),
-        );
+        collapsed.push(Array(self.viewData[0].length).fill(''));
         collapsedCount++;
       }
     }
@@ -1291,7 +1082,7 @@ export default function (self, ctor) {
     return fontStyle.replace(/\d+\.?\d*px/, '');
   };
   self.getFontHeight = function (fontStyle) {
-    return parseFloat(fontStyle, 10);
+    return parseFloat(fontStyle);
   };
   self.parseStyleValue = function (key) {
     if (/Font/.test(key)) {
@@ -1483,7 +1274,6 @@ export default function (self, ctor) {
     self.intf.clipElement = self.clipElement;
     self.intf.getSchemaFromData = self.getSchemaFromData;
     self.intf.setFilter = self.setFilter;
-    self.intf.selectRow = self.selectRow;
     self.intf.parentGrid = self.parentGrid;
     self.intf.toggleTree = self.toggleTree;
     self.intf.expandTree = self.expandTree;
@@ -1893,7 +1683,23 @@ export default function (self, ctor) {
       return self.visibleRows;
     },
   });
+  let warnedForObsoleteSelections;
   Object.defineProperty(self.intf, 'selections', {
+    get: function () {
+      if (!warnedForObsoleteSelections) {
+        console.warn(
+          `DeprecationWarning: The property 'selections' is deprecated due to performance issue. ` +
+            `And it will be removed in the future.` +
+            `Please use new property 'selectionList' instead. ` +
+            `Visit this link to get more information: ` +
+            `https://github.com/TonyGermaneri/canvas-datagrid/pull/498`,
+        );
+        warnedForObsoleteSelections = true;
+      }
+      return self.getObsoleteSelectionMatrix();
+    },
+  });
+  Object.defineProperty(self.intf, 'selectionList', {
     get: function () {
       return self.selections;
     },
@@ -2057,6 +1863,14 @@ export default function (self, ctor) {
       self.cellGridAttributes = value;
     },
   });
+  Object.defineProperty(self.intf, 'fillCellCallback', {
+    get: function () {
+      return self.fillCellCallback;
+    },
+    set: function setFillCellCallback(value) {
+      self.fillCellCallback = value;
+    },
+  });
   Object.defineProperty(self.intf, 'ctx', {
     get: function () {
       return self.ctx;

package/lib/main.js

@@ -8,6 +8,7 @@ import draw from './draw';
 import events from './events';
 import touch from './touch';
 import intf from './intf';
+import selections from './selections/index';
 import contextMenu from './contextMenu';
 import button from './button';
 import dom from './dom';
@@ -21,6 +22,7 @@ var modules = [
   events,
   touch,
   intf,
+  selections,
   contextMenu,
   button,
   dom,
@@ -103,6 +105,7 @@ export default function canvasDatagrid(args) {
       'filters',
       'treeGridAttributes',
       'cellGridAttributes',
+      'fillCellCallback',
       'data',
       'schema',
     ];