Refactor #1292 - For DataTable

primefaces · Mar 9, 2021 · 67f60fc · 67f60fc
1 parent 5e93c10
commit 67f60fc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/src/components/datatable/BodyCell.js b/src/components/datatable/BodyCell.js
@@ -48,7 +48,7 @@ export class BodyCell extends Component {
     }
 
     onClick(event) {
-        if (this.props.editMode !== 'row' && this.props.editor && !this.state.editing && (!this.props.tableSelectionMode || (this.props.tableSelectionMode && this.props.selected))) {
+        if (this.props.editMode !== 'row' && this.props.editor && !this.state.editing && (this.props.selectOnEdit || (!this.props.selectOnEdit && this.props.selected))) {
             this.selfClick = true;
 
             if (this.props.onBeforeEditorShow) {

diff --git a/src/components/datatable/BodyRow.js b/src/components/datatable/BodyRow.js
@@ -289,8 +289,8 @@ export class BodyRow extends Component {
             }
 
             let editing = this.getEditing();
-            let cell = <BodyCell tableId={this.props.tableId} key={i} {...column.props} tableSelectionMode={this.props.selectionMode} value={this.props.value} rowSpan={rowSpan} rowData={this.props.rowData} rowIndex={this.props.rowIndex} onRowToggle={this.props.onRowToggle} expanded={this.props.expanded}
-                            onRadioClick={this.props.onRadioClick} onCheckboxClick={this.props.onCheckboxClick} selected={this.props.selected}
+            let cell = <BodyCell tableId={this.props.tableId} key={i} {...column.props} value={this.props.value} rowSpan={rowSpan} rowData={this.props.rowData} rowIndex={this.props.rowIndex} onRowToggle={this.props.onRowToggle} expanded={this.props.expanded}
+                            onRadioClick={this.props.onRadioClick} onCheckboxClick={this.props.onCheckboxClick} selected={this.props.selected} selectOnEdit={this.props.selectOnEdit}
                             editMode={this.props.editMode} editing={editing} onRowEditInit={this.onRowEditInit} onRowEditSave={this.onRowEditSave} onRowEditCancel={this.onRowEditCancel}
                             showRowReorderElement={this.props.showRowReorderElement} showSelectionElement={this.props.showSelectionElement} />;
 

diff --git a/src/components/datatable/DataTable.d.ts b/src/components/datatable/DataTable.d.ts
@@ -37,6 +37,7 @@ interface DataTableProps {
     compareSelectionBy?: string;
     dataKey?: string;
     metaKeySelection?: boolean;
+    selectOnEdit?: boolean;
     headerColumnGroup?: any;
     footerColumnGroup?: any;
     frozenHeaderColumnGroup?: any;

diff --git a/src/components/datatable/DataTable.js b/src/components/datatable/DataTable.js
@@ -52,6 +52,7 @@ export class DataTable extends Component {
         compareSelectionBy: 'deepEquals',
         dataKey: null,
         metaKeySelection: true,
+        selectOnEdit: true,
         headerColumnGroup: null,
         footerColumnGroup: null,
         frozenHeaderColumnGroup: null,
@@ -155,6 +156,7 @@ export class DataTable extends Component {
         compareSelectionBy: PropTypes.string,
         dataKey: PropTypes.string,
         metaKeySelection: PropTypes.bool,
+        selectOnEdit: PropTypes.bool,
         headerColumnGroup: PropTypes.any,
         footerColumnGroup: PropTypes.any,
         frozenHeaderColumnGroup: PropTypes.any,
@@ -1328,7 +1330,7 @@ export class DataTable extends Component {
                         selectionMode={this.props.selectionMode} selection={this.props.selection} metaKeySelection={this.props.metaKeySelection} frozen={frozen} frozenSelectionMode={this.frozenSelectionMode}
                         onSelectionChange={this.props.onSelectionChange} onRowClick={this.props.onRowClick} onRowDoubleClick={this.props.onRowDoubleClick} onRowSelect={this.props.onRowSelect} onRowUnselect={this.props.onRowUnselect}
                         contextMenuSelection={this.props.contextMenuSelection} onContextMenuSelectionChange={this.props.onContextMenuSelectionChange} onContextMenu={this.props.onContextMenu}
-                        expandedRows={this.props.expandedRows} onRowToggle={this.props.onRowToggle} rowExpansionTemplate={this.props.rowExpansionTemplate}
+                        expandedRows={this.props.expandedRows} onRowToggle={this.props.onRowToggle} rowExpansionTemplate={this.props.rowExpansionTemplate} selectOnEdit={this.props.selectOnEdit}
                         onRowExpand={this.props.onRowExpand} onRowCollapse={this.props.onRowCollapse} emptyMessage={this.props.emptyMessage}
                         virtualScroll={this.props.virtualScroll} virtualRowHeight={this.props.virtualRowHeight} loading={this.props.loading}
                         groupField={this.props.groupField} rowGroupMode={this.props.rowGroupMode} rowGroupHeaderTemplate={this.props.rowGroupHeaderTemplate} rowGroupFooterTemplate={this.props.rowGroupFooterTemplate}

diff --git a/src/components/datatable/TableBody.js b/src/components/datatable/TableBody.js
@@ -587,7 +587,7 @@ export class TableBody extends Component {
                     if (!this.props.expandableRowGroups || isRowGroupExpanded) {
                         //row content
                         let bodyRow = <BodyRow tableId={this.props.tableId} key={i} value={this.props.value} rowData={rowData} rowIndex={i} onClick={this.onRowClick} onDoubleClick={this.props.onRowDoubleClick} onRightClick={this.onRowRightClick} onTouchEnd={this.onRowTouchEnd}
-                                            onRowToggle={this.onRowToggle} expanded={expanded} selectionMode={this.props.selectionMode}
+                                            onRowToggle={this.onRowToggle} expanded={expanded} selectionMode={this.props.selectionMode} selectOnEdit={this.props.selectOnEdit}
                                             onRadioClick={this.onRadioClick} onCheckboxClick={this.onCheckboxClick} selected={selected} contextMenuSelected={contextMenuSelected} rowClassName={this.props.rowClassName}
                                             sortField={this.props.sortField} rowGroupMode={this.props.rowGroupMode} groupRowSpan={groupRowSpan}
                                             onDragStart={(e) => this.onRowDragStart(e, i)} onDragEnd={this.onRowDragEnd} onDragOver={(e) => this.onRowDragOver(e, i)} onDragLeave={this.onRowDragLeave}