Fixed #2561 - Calendar as editor inside DataTable in row edit mode

primefaces · Jan 19, 2022 · 65f99f9 · 65f99f9
1 parent 5a3aec3
commit 65f99f9
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/components/lib/datatable/BodyCell.js b/components/lib/datatable/BodyCell.js
@@ -196,14 +196,22 @@ export class BodyCell extends Component {
         clearTimeout(this.tabindexTimeout);
         this.tabindexTimeout = setTimeout(() => {
             if (this.state.editing) {
-                const focusableEl = DomHandler.getFirstFocusableElement(this.el, ':not(.p-cell-editor-key-helper)');
+                const focusableEl = this.props.editMode === 'cell' ? DomHandler.getFirstFocusableElement(this.el, ':not(.p-cell-editor-key-helper)') : DomHandler.findSingle(this.el, '.p-row-editor-save');
                 focusableEl && focusableEl.focus();
             }
 
             this.keyHelper && (this.keyHelper.tabIndex = this.state.editing ? -1 : 0);
         }, 1);
     }
 
+    focusOnInit() {
+        clearTimeout(this.initFocusTimeout);
+        this.initFocusTimeout = setTimeout(() => {
+            const focusableEl = this.props.editMode === 'row' ? DomHandler.findSingle(this.el, '.p-row-editor-init') : null;
+            focusableEl && focusableEl.focus();
+        }, 1);
+    }
+
     updateStickyPosition() {
         if (this.getColumnProp('frozen')) {
             let styleObject = { ...this.state.styleObject };
@@ -424,10 +432,12 @@ export class BodyCell extends Component {
 
     onRowEditSave(event) {
         this.props.onRowEditSave({ originalEvent: event, data: this.props.rowData, newData: this.getEditingRowData(), field: this.field, index: this.props.rowIndex });
+        this.focusOnInit();
     }
 
     onRowEditCancel(event) {
         this.props.onRowEditCancel({ originalEvent: event, data: this.props.rowData, newData: this.getEditingRowData(), field: this.field, index: this.props.rowIndex });
+        this.focusOnInit();
     }
 
     bindDocumentEditListener() {