ka-table - npm Package Compare versions

Comparing version 7.6.4 to 7.7.0

Components/DataRowContent/DataRowContent.js

@@ -14,7 +14,6 @@ "use strict";
 var DataRowContent = function (_a) {
-    var childComponents = _a.childComponents, columns = _a.columns, treeDeep = _a.treeDeep, dispatch = _a.dispatch, editingMode = _a.editingMode, format = _a.format, isDetailsRowShown = _a.isDetailsRowShown, isSelectedRow = _a.isSelectedRow, isTreeExpanded = _a.isTreeExpanded, isTreeGroup = _a.isTreeGroup, rowData = _a.rowData, rowEditableCells = _a.rowEditableCells, rowKeyField = _a.rowKeyField, rowKeyValue = _a.rowKeyValue, selectedRows = _a.selectedRows, validation = _a.validation;
-    var arrow = isTreeGroup ? [(react_1.default.createElement("div", { onClick: function () { return dispatch(actionCreators_1.updateTreeGroupsExpanded(rowKeyValue)); }, className: isTreeExpanded
-                ? defaultOptions_1.default.css.iconTreeArrowExpanded : defaultOptions_1.default.css.iconTreeArrowCollapsed }))] : undefined;
+    var childComponents = _a.childComponents, columns = _a.columns, treeDeep = _a.treeDeep, dispatch = _a.dispatch, editingMode = _a.editingMode, format = _a.format, isDetailsRowShown = _a.isDetailsRowShown, isSelectedRow = _a.isSelectedRow, isTreeExpanded = _a.isTreeExpanded, isTreeGroup = _a.isTreeGroup, rowData = _a.rowData, rowEditableCells = _a.rowEditableCells, rowKeyField = _a.rowKeyField, rowKeyValue = _a.rowKeyValue, selectedRows = _a.selectedRows, validation = _a.validation, treeExpandButtonColumnKey = _a.treeExpandButtonColumnKey;
+    var arrow = isTreeGroup ? (react_1.default.createElement("div", { onClick: function () { return dispatch(actionCreators_1.updateTreeGroupsExpanded(rowKeyValue)); }, className: isTreeExpanded
+            ? defaultOptions_1.default.css.iconTreeArrowExpanded : defaultOptions_1.default.css.iconTreeArrowCollapsed })) : undefined;
     return (react_1.default.createElement(react_1.default.Fragment, null, columns.map(function (column, index) {
-        var _a;
         var editableCell = CellUtils_1.getEditableCell(column, rowEditableCells);
@@ -24,6 +23,7 @@ var hasEditorValue = editableCell && editableCell.hasOwnProperty('editorValue');
         var value = hasEditorValue ? editorValue : DataUtils_1.getValueByColumn(rowData, column);
-        var cellDeep = treeDeep != null && index === 0 ? treeDeep : undefined;
-        return (react_1.default.createElement(CellComponent_1.default, { treeArrowElement: (_a = arrow) === null || _a === void 0 ? void 0 : _a.pop(), childComponents: childComponents, treeDeep: cellDeep, column: column, dispatch: dispatch, editingMode: editingMode, editorValue: editorValue, field: ColumnUtils_1.getField(column), format: format, hasEditorValue: editableCell && editableCell.hasOwnProperty('editorValue'), isDetailsRowShown: isDetailsRowShown, isEditableCell: !!editableCell, isSelectedRow: isSelectedRow, key: column.key, rowData: rowData, rowKeyField: rowKeyField, rowKeyValue: rowKeyValue, selectedRows: selectedRows, validation: validation, validationMessage: editableCell && editableCell.validationMessage, value: value }));
+        var isTreeColumn = treeExpandButtonColumnKey ? treeExpandButtonColumnKey === column.key : index === 0;
+        var cellDeep = treeDeep != null && isTreeColumn ? treeDeep : undefined;
+        return (react_1.default.createElement(CellComponent_1.default, { treeArrowElement: isTreeColumn && arrow, childComponents: childComponents, treeDeep: cellDeep, column: column, dispatch: dispatch, editingMode: editingMode, editorValue: editorValue, field: ColumnUtils_1.getField(column), format: format, hasEditorValue: editableCell && editableCell.hasOwnProperty('editorValue'), isDetailsRowShown: isDetailsRowShown, isEditableCell: !!editableCell, isSelectedRow: isSelectedRow, key: column.key, rowData: rowData, rowKeyField: rowKeyField, rowKeyValue: rowKeyValue, selectedRows: selectedRows, validation: validation, validationMessage: editableCell && editableCell.validationMessage, value: value }));
     })));
 };
 exports.default = DataRowContent;

Components/Rows/Rows.js

@@ -33,3 +33,3 @@ "use strict";
 var Rows = function (props) {
-    var childComponents = props.childComponents, columns = props.columns, data = props.data, _a = props.detailsRows, detailsRows = _a === void 0 ? [] : _a, dispatch = props.dispatch, editableCells = props.editableCells, format = props.format, groupedColumns = props.groupedColumns, _b = props.groups, groups = _b === void 0 ? [] : _b, _c = props.groupsExpanded, groupsExpanded = _c === void 0 ? [] : _c, onFirstRowRendered = props.onFirstRowRendered, treeGroupsExpanded = props.treeGroupsExpanded, rowKeyField = props.rowKeyField, rowReordering = props.rowReordering, selectedRows = props.selectedRows, validation = props.validation;
+    var childComponents = props.childComponents, columns = props.columns, data = props.data, _a = props.detailsRows, detailsRows = _a === void 0 ? [] : _a, dispatch = props.dispatch, editableCells = props.editableCells, format = props.format, groupedColumns = props.groupedColumns, _b = props.groups, groups = _b === void 0 ? [] : _b, _c = props.groupsExpanded, groupsExpanded = _c === void 0 ? [] : _c, onFirstRowRendered = props.onFirstRowRendered, treeGroupsExpanded = props.treeGroupsExpanded, rowKeyField = props.rowKeyField, rowReordering = props.rowReordering, selectedRows = props.selectedRows, validation = props.validation, treeExpandButtonColumnKey = props.treeExpandButtonColumnKey;
     var groupMark = GroupUtils_1.getGroupMark();
@@ -61,3 +61,3 @@ var firstRowRef = react_1.useRef(null);
             var rowEditableCells = FilterUtils_1.getRowEditableCells(rowKeyValue_1, editableCells);
-            var dataRow = (react_1.default.createElement(DataAndDetailsRows_1.default, { childComponents: props.childComponents, columns: props.columns, dispatch: dispatch, editableCells: props.editableCells, editingMode: props.editingMode, isTreeGroup: isTreeGroup, isTreeExpanded: isTreeExpanded, treeDeep: isTreeRow === true ? d.treeDeep : undefined, format: format, groupColumnsCount: props.groupColumnsCount, isDetailsRowShown: isDetailsRowShown, isSelectedRow: isSelectedRow, key: rowKeyValue_1, rowData: rowData, rowEditableCells: rowEditableCells, rowKeyField: props.rowKeyField, rowKeyValue: rowKeyValue_1, rowReordering: rowReordering, selectedRows: props.selectedRows, trRef: rowRefLink, validation: validation }));
+            var dataRow = (react_1.default.createElement(DataAndDetailsRows_1.default, { childComponents: props.childComponents, columns: props.columns, dispatch: dispatch, editableCells: props.editableCells, editingMode: props.editingMode, isTreeGroup: isTreeGroup, isTreeExpanded: isTreeExpanded, treeDeep: isTreeRow === true ? d.treeDeep : undefined, treeExpandButtonColumnKey: treeExpandButtonColumnKey, format: format, groupColumnsCount: props.groupColumnsCount, isDetailsRowShown: isDetailsRowShown, isSelectedRow: isSelectedRow, key: rowKeyValue_1, rowData: rowData, rowEditableCells: rowEditableCells, rowKeyField: props.rowKeyField, rowKeyValue: rowKeyValue_1, rowReordering: rowReordering, selectedRows: props.selectedRows, trRef: rowRefLink, validation: validation }));
             rowRefLink = undefined;
@@ -64,0 +64,0 @@ return dataRow;

Components/Table/Table.d.ts

@@ -34,2 +34,3 @@ import * as React from 'react';
     treeGroupsExpanded?: any[];
+    treeExpandButtonColumnKey?: string;
     rowReordering?: boolean;
@@ -36,0 +37,0 @@ search?: SearchFunc;

package.json

 {
   "name": "ka-table",
-  "version": "7.6.4",
+  "version": "7.7.0",
   "license": "MIT",
@@ -5,0 +5,0 @@ "repository": "github:komarovalexander/ka-table",

props.d.ts

@@ -15,2 +15,3 @@ import { IRowsProps } from './Components/Rows/Rows';
     treeDeep?: number;
+    treeExpandButtonColumnKey?: string;
     dispatch: DispatchFunc;
@@ -162,2 +163,3 @@ editableCells: EditableCell[];
     virtualScrolling?: VirtualScrolling;
+    treeExpandButtonColumnKey?: string;
 }
@@ -164,0 +166,0 @@ export interface ITableFootProps extends ITableAllProps {

Utils/ReducerUtils.d.ts

@@ -38,2 +38,3 @@ import { ITableProps } from '../';
     treeGroupsExpanded?: any[];
+    treeExpandButtonColumnKey?: string;
     rowReordering?: boolean;
@@ -40,0 +41,0 @@ search?: import("../types").SearchFunc;

No alert changes

Improved metrics

Total package byte prevSize

309791

increased by0.13%

Lines of code

6130

increased by0.07%

No dependency changes