Comparing version 8.6.0 to 8.7.0
@@ -47,9 +47,15 @@ "use strict"; | ||
var column = props.column, childComponents = props.childComponents, data = props.data, dispatch = props.dispatch, format = props.format; | ||
var headerFilterValues = data === null || data === void 0 ? void 0 : data.map(function (item) { | ||
var value = (0, DataUtils_1.getValueByColumn)(item, column); | ||
var formattedValue = (format && format({ column: column, value: value, rowData: item })) | ||
|| (value === null || value === void 0 ? void 0 : value.toString()); | ||
return formattedValue; | ||
}); | ||
headerFilterValues = Array.from(new Set(headerFilterValues)); | ||
var headerFilterValues; | ||
if (column === null || column === void 0 ? void 0 : column.headerFilterListItems) { | ||
headerFilterValues = column === null || column === void 0 ? void 0 : column.headerFilterListItems({ data: data }); | ||
} | ||
else { | ||
headerFilterValues = data === null || data === void 0 ? void 0 : data.map(function (item) { | ||
var value = (0, DataUtils_1.getValueByColumn)(item, column); | ||
var formattedValue = (format && format({ column: column, value: value, rowData: item })) | ||
|| (value === null || value === void 0 ? void 0 : value.toString()); | ||
return formattedValue; | ||
}); | ||
headerFilterValues = Array.from(new Set(headerFilterValues)); | ||
} | ||
var _a = (0, ComponentUtils_1.getElementCustomization)({ | ||
@@ -56,0 +62,0 @@ className: "".concat(defaultOptions_1.default.css.popupContent) |
@@ -41,5 +41,6 @@ "use strict"; | ||
var React = __importStar(require("react")); | ||
var actionCreators_1 = require("../../actionCreators"); | ||
var PopupContentItemText_1 = __importDefault(require("../PopupContentItemText/PopupContentItemText")); | ||
var defaultOptions_1 = __importDefault(require("../../defaultOptions")); | ||
var ComponentUtils_1 = require("../../Utils/ComponentUtils"); | ||
var actionCreators_1 = require("../../actionCreators"); | ||
var PopupContentItem = function (props) { | ||
@@ -58,4 +59,4 @@ var _a, _b; | ||
React.createElement("input", { className: 'ka-input', type: 'checkbox', checked: checked, onChange: handleChange })), | ||
React.createElement("div", { className: 'ka-popup-content-item-value' }, item))))); | ||
React.createElement(PopupContentItemText_1.default, __assign({}, props)))))); | ||
}; | ||
exports.default = PopupContentItem; |
@@ -36,2 +36,3 @@ import { ICellEditorProps, ICellProps, ICellTextProps, IDataRowProps, IEmptyCellProps, IFilterRowEditorProps, IGroupPanelCellProps, IGroupPanelProps, IGroupRowProps, IGroupSummaryCellProps, IGroupSummaryRowProps, IHeadCellProps, IHeadCellResizeProps, IHeadRowProps, IHeaderFilterButtonProps, ILoadingProps, INoDataRowProps, IPagingIndexProps, IPagingProps, IPagingSizeProps, IPopupContentItemProps, IPopupContentProps, ISortIconProps, ISummaryCellProps, ISummaryRowProps, ITableBodyProps, ITableFootProps, ITableHeadProps } from '../props'; | ||
popupContentItem?: ChildComponent<IPopupContentItemProps>; | ||
popupContentItemText?: ChildComponent<IPopupContentItemProps>; | ||
rootDiv?: ChildComponent<ITableProps>; | ||
@@ -38,0 +39,0 @@ sortIcon?: ChildComponent<ISortIconProps>; |
@@ -13,2 +13,6 @@ /// <reference types="react" /> | ||
headerFilterPopupPosition?: PopupPosition; | ||
headerFilterListItems?: (props: { | ||
data?: any[]; | ||
}) => any[]; | ||
filter?: (value: any, filterValue: any, rowData?: any) => boolean; | ||
isHeaderFilterPopupShown?: boolean; | ||
@@ -15,0 +19,0 @@ isEditable?: boolean; |
{ | ||
"name": "ka-table", | ||
"version": "8.6.0", | ||
"version": "8.7.0", | ||
"license": "MIT", | ||
@@ -5,0 +5,0 @@ "repository": "github:komarovalexander/ka-table", |
@@ -74,3 +74,3 @@ "use strict"; | ||
} | ||
var customFilter = filter === null || filter === void 0 ? void 0 : filter({ column: column }); | ||
var customFilter = column.filter || (filter === null || filter === void 0 ? void 0 : filter({ column: column })); | ||
var compare = customFilter || getCompare(column); | ||
@@ -147,2 +147,5 @@ return initialData.filter(function (d) { | ||
var value = (0, DataUtils_1.getValueByColumn)(item, column); | ||
if (column === null || column === void 0 ? void 0 : column.filter) { | ||
return column.filter(value, column.headerFilterValues, item); | ||
} | ||
var fieldValue = (format && format({ column: column, value: value, rowData: item })) | ||
@@ -149,0 +152,0 @@ || (value === null || value === void 0 ? void 0 : value.toString()); |
@@ -13,2 +13,6 @@ /// <reference types="react" /> | ||
headerFilterPopupPosition?: import("../Models/PopupPosition").PopupPosition; | ||
headerFilterListItems?: (props: { | ||
data?: any[]; | ||
}) => any[]; | ||
filter?: (value: any, filterValue: any, rowData?: any) => boolean; | ||
isHeaderFilterPopupShown?: boolean; | ||
@@ -15,0 +19,0 @@ isEditable?: boolean; |
390750
250
8019