itsa-react-table 16.8.3 → 16.10.0

package/lib/component.jsx

@@ -339,7 +339,7 @@ class Table extends React.Component {
     }
 
     if (
-      (editValueBeforeEdit === editValueBeforeBlur && !selectedRange) ||
+      (editValueBeforeEdit === editValueBeforeBlur && !selectedRange && !force) ||
       editValueBeforeBlur === undefined
     ) {
       // nothing changed
@@ -419,7 +419,9 @@ class Table extends React.Component {
             }
           }
         }
-        changed && onChangeCell(cells, editValueBeforeBlur);
+        if (changed) {
+          onChangeCell(cells, editValueBeforeBlur);
+        }
       }
     }
     if (selectedRange) {
@@ -427,6 +429,39 @@ class Table extends React.Component {
     }
   }
 
+  /**
+   * Returns the current selected range information
+   * @method getSelectedRange
+   * @return {Object|null} Range object with {x1, y1, x2, y2} or null if no range
+   * @since 2.0.0
+   */
+  getSelectedRange() {
+    return this.state.selectedRange;
+  }
+
+  /**
+   * Returns the current range start position
+   * @method getRangeStart
+   * @return {Object|null} Range start with {x, y} or null if no range start
+   * @since 2.0.0
+   */
+  getRangeStart() {
+    return this.state.selectedRangeStart;
+  }
+
+  /**
+   * Returns complete range information including start and selected range
+   * @method getRangeInfo
+   * @return {Object} Object with {rangeStart, selectedRange}
+   * @since 2.0.0
+   */
+  getRangeInfo() {
+    return {
+      rangeStart: this.state.selectedRangeStart,
+      selectedRange: this.state.selectedRange
+    };
+  }
+
   focus() {
     let editableCol, columns, hasColumns, item, editValue, editableCols;
     const instance = this,
@@ -1026,6 +1061,7 @@ class Table extends React.Component {
     const instance = this,
       props = instance.props,
       state = instance.state,
+      editableBlurCols = props.editableBlurCols,
       keyCode = e.keyCode,
       shiftKey = e.shiftKey,
       ctrlKey = e.metaKey || e.ctrlKey,
@@ -1041,6 +1077,16 @@ class Table extends React.Component {
       columns = props.columns,
       hasColumns = columns && columns.length > 0;
 
+    let preventDomFocus = false;
+    if (typeof editableBlurCols !== "undefined") {
+      if (typeof editableBlurCols === "number") {
+        preventDomFocus = editableBlurCols === state.editableCol;
+      }
+      if (Array.isArray(editableBlurCols)) {
+        preventDomFocus = editableBlurCols.includes(state.editableCol);
+      }
+    }
+
     const implementChanges = (keepFocus) => {
       if (props.editable === true || state.selectedRange) {
         // NOT 'full' for that would take care of itself
@@ -1211,7 +1257,22 @@ class Table extends React.Component {
           },
           selectedRange: null,
         });
-        instance._focusActiveCell();
+        if (preventDomFocus) {
+          instance.setState(
+            (prevState) => {
+              return {
+                // editValue: instance._editValueBeforeEdit,
+                editableRow: null,
+                editableCol: null,
+              };
+            },
+            () => {
+              instance._blurActiveCell();
+            }
+          );
+        } else {
+          instance._focusActiveCell();
+        }
         implementChanges();
       }
     }
@@ -1235,10 +1296,14 @@ class Table extends React.Component {
       prevRowId,
       prevColId,
       selectedRangeStart;
-    node.tagName === "TD" || (node = node.parentNode);
+    while (node && node.tagName !== "TD") {
+      node = node.parentNode;
+    }
+    if (!node) {
+      return;
+    }
     colId = parseInt(node.getAttribute("data-colid"), 10);
-    node = node.parentNode;
-    rowId = parseInt(node.getAttribute("data-rowid"), 10);
+    rowId = parseInt(node.parentNode.getAttribute("data-rowid"), 10);
     if (typeof editableCols === "number") {
       editableCols = [editableCols];
     }
@@ -1481,6 +1546,7 @@ Table.propTypes = {
   data: PropTypes.array,
   disabled: PropTypes.bool,
   editable: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
+  editableBlurCols: PropTypes.oneOfType([PropTypes.array, PropTypes.number]),
   editableCols: PropTypes.oneOfType([PropTypes.array, PropTypes.number]),
   editDirectionDown: PropTypes.bool,
   extendableX: PropTypes.bool,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itsa-react-table",
-  "version": "16.8.3",
+  "version": "16.10.0",
   "description": "Editable React.js table",
   "author": [
     {