Prevent tab default behaviour if validate invalid

Fixes primefaces#1024
NellyHaglund · Oct 1, 2019 · 8f4e088 · 8f4e088
1 parent 9cbcca8
commit 8f4e088
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/components/datatable/BodyCell.js b/src/components/datatable/BodyCell.js
@@ -30,7 +30,7 @@ export class BodyCell extends Component {
 
     onKeyDown(event) {
         if (event.which === 13 || event.which === 9) { // tab || enter
-            this.switchCellToViewMode(true);
+            this.switchCellToViewMode(true, event);
         }
         if (event.which === 27) // escape
         {
@@ -52,9 +52,9 @@ export class BodyCell extends Component {
         }
     }
 
-    onBlur() {
+    onBlur(event) {
         if (this.state.editing && this.props.editorValidatorEvent === 'blur') {
-            this.switchCellToViewMode(true);
+            this.switchCellToViewMode(true, event);
         }
     }
 
@@ -66,7 +66,7 @@ export class BodyCell extends Component {
         if (!this.documentEditListener) {
             this.documentEditListener = (event) => {
                 if (!this.editingCellClick) {
-                    this.switchCellToViewMode(true);
+                    this.switchCellToViewMode(true, event);
                 }
 
                 this.editingCellClick = false;
@@ -86,7 +86,7 @@ export class BodyCell extends Component {
         this.unbindDocumentEditListener();
     }
 
-    switchCellToViewMode(submit) {
+    switchCellToViewMode(submit, event = {}) {
         if (this.props.editorValidator && submit) {
             let valid = this.props.editorValidator(this.props);
             if (valid) {
@@ -95,6 +95,9 @@ export class BodyCell extends Component {
                 }
                 this.closeCell();
             } // as per previous version if not valid and another editor is open, keep invalid data editor open.
+            else {
+                event.preventDefault();
+            }
         }
         else {
             if (submit && this.props.onEditorSubmit) {