Refactor #1292 - For TreeTable

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

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/src/components/treetable/TreeTable.d.ts b/src/components/treetable/TreeTable.d.ts
@@ -35,6 +35,7 @@ interface TreeTableProps {
     selectionKeys?: any;
     contextMenuSelectionKey?: any;
     metaKeySelection?: boolean;
+    selectOnEdit?: boolean;
     propagateSelectionUp?: boolean;
     propagateSelectionDown?: boolean;
     autoLayout?:boolean;

diff --git a/src/components/treetable/TreeTable.js b/src/components/treetable/TreeTable.js
@@ -46,6 +46,7 @@ export class TreeTable extends Component {
         selectionKeys: null,
         contextMenuSelectionKey: null,
         metaKeySelection: true,
+        selectOnEdit: true,
         propagateSelectionUp: true,
         propagateSelectionDown: true,
         autoLayout: false,
@@ -119,6 +120,7 @@ export class TreeTable extends Component {
         selectionKeys: PropTypes.any,
         contextMenuSelectionKey: PropTypes.any,
         metaKeySelection: PropTypes.bool,
+        selectOnEdit: PropTypes.bool,
         propagateSelectionUp: PropTypes.bool,
         propagateSelectionDown: PropTypes.bool,
         autoLayout: PropTypes.bool,
@@ -908,7 +910,7 @@ export class TreeTable extends Component {
 
     createTableBody(value, columns) {
         return (
-            <TreeTableBody value={value} columns={columns} expandedKeys={this.getExpandedKeys()}
+            <TreeTableBody value={value} columns={columns} expandedKeys={this.getExpandedKeys()} selectOnEdit={this.props.selectOnEdit}
                         onToggle={this.onToggle} onExpand={this.props.onExpand} onCollapse={this.props.onCollapse}
                         paginator={this.props.paginator} first={this.getFirst()} rows={this.getRows()}
                         selectionMode={this.props.selectionMode} selectionKeys={this.props.selectionKeys} onSelectionChange={this.props.onSelectionChange}

diff --git a/src/components/treetable/TreeTableBody.js b/src/components/treetable/TreeTableBody.js
@@ -62,7 +62,7 @@ export class TreeTableBody extends Component {
 
     createRow(node, index) {
         return (
-            <TreeTableRow key={node.key||JSON.stringify(node.data)} level={0} rowIndex={index}
+            <TreeTableRow key={node.key||JSON.stringify(node.data)} level={0} rowIndex={index} selectOnEdit={this.props.selectOnEdit}
                             node={node} columns={this.props.columns} expandedKeys={this.props.expandedKeys}
                             onToggle={this.props.onToggle} onExpand={this.props.onExpand} onCollapse={this.props.onCollapse}
                             selectionMode={this.props.selectionMode} selectionKeys={this.props.selectionKeys} onSelectionChange={this.props.onSelectionChange}

diff --git a/src/components/treetable/TreeTableBodyCell.js b/src/components/treetable/TreeTableBodyCell.js
@@ -21,7 +21,7 @@ export class TreeTableBodyCell extends Component {
     }
 
     onClick() {
-        if (this.props.editor && !this.state.editing && (!this.props.treeTableSelectionMode || (this.props.treeTableSelectionMode && this.props.selected))) {
+        if (this.props.editor && !this.state.editing && (this.props.selectOnEdit || (!this.props.selectOnEdit && this.props.selected))) {
             this.selfClick = true;
 
             this.setState({

diff --git a/src/components/treetable/TreeTableRow.js b/src/components/treetable/TreeTableRow.js
@@ -501,7 +501,7 @@ export class TreeTableRow extends Component {
         }
 
         return (
-            <TreeTableBodyCell key={column.props.columnKey||column.props.field} {...column.props} treeTableSelectionMode={this.props.selectionMode} selected={this.isSelected()} node={this.props.node} rowIndex={this.props.rowIndex}>
+            <TreeTableBodyCell key={column.props.columnKey||column.props.field} {...column.props} selectOnEdit={this.props.selectOnEdit} selected={this.isSelected()} node={this.props.node} rowIndex={this.props.rowIndex}>
                 {toggler}
                 {checkbox}
             </TreeTableBodyCell>