Skip to content

Commit 228e588

Browse files
author
Samvel Baghdasaryan
committed
new-column-type
1 parent fedfa1c commit 228e588

File tree

6 files changed

+30
-8
lines changed

6 files changed

+30
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "beautiful-react-table",
3-
"version": "7.7.3",
3+
"version": "7.7.4",
44
"description": "My first react typescript package",
55
"main": "./dist/cjs/index.js",
66
"module": "./dist/esm/index.js",

src/Models/table.enum.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export enum ColumnTypeEnums {
5252
Tags = 'Tags',
5353
NumberCollection = 'NumberCollection',
5454
TextCollection = 'TextCollection',
55+
TikoType = 'TikoType',
5556
}
5657

5758
export const numberFields = [ColumnTypeEnums.Number, ColumnTypeEnums.Currency, ColumnTypeEnums.Percentage]

src/table/MainHeader/Filter/FiltersPerColumn/UiTypes/ModalSingleField.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const ModalForSingleField = ({
7575
setIsLoadedMoreData(false)
7676
const selectedValue: string[] = value.length ? [value.at(-1)] : []
7777
setCheckedItems(selectedValue)
78-
if (item.ColumnType !== ColumnTypeEnums.Text) {
78+
if (item.ColumnType !== ColumnTypeEnums.Text && item.ColumnType !== ColumnTypeEnums.TikoType) {
7979
let newValues: number[] = []
8080
newValues = selectedValue.map((item: string) => +item)
8181
if (!isOpened) {
@@ -90,7 +90,11 @@ const ModalForSingleField = ({
9090
}
9191
}
9292
const onChange = (newInputValue: string) => {
93-
if (item.ColumnType !== ColumnTypeEnums.Text && !containsOnlyNumbers(newInputValue)) {
93+
if (
94+
item.ColumnType !== ColumnTypeEnums.Text &&
95+
item.ColumnType !== ColumnTypeEnums.TikoType &&
96+
!containsOnlyNumbers(newInputValue)
97+
) {
9498
setErrMessage(translations?.filterAction.onlyNumbers || 'only numbers')
9599
setVal(newInputValue)
96100
return
@@ -103,7 +107,7 @@ const ModalForSingleField = ({
103107

104108
const isEmpty = () => {
105109
if (item.ColumnName === columnName && !isLoadingFilters && !perColumnListForFilters?.length && val.length) {
106-
if (item.ColumnType !== ColumnTypeEnums.Text) {
110+
if (item.ColumnType !== ColumnTypeEnums.Text && item.ColumnType !== ColumnTypeEnums.TikoType) {
107111
if (containsOnlyNumbers(val)) return true
108112
} else {
109113
return true
@@ -144,7 +148,7 @@ const ModalForSingleField = ({
144148
useEffect(() => {
145149
if (item.ColumnName === filterTyping.PropertyName) {
146150
let newValues: string[] = filterTyping.CheckedItems
147-
if (item.ColumnType !== ColumnTypeEnums.Text) {
151+
if (item.ColumnType !== ColumnTypeEnums.Text && item.ColumnType !== ColumnTypeEnums.TikoType) {
148152
newValues = filterTyping.CheckedItems.map((item: number) => item + '')
149153
}
150154
setCheckedItems(newValues)

src/table/MainHeader/Filter/FiltersPerColumn/UiTypes/MultipleCheck.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const MultipleCheck = ({
136136
}
137137
const isEmpty = () => {
138138
if (item.ColumnName === columnName && !isLoadingFilters && !perColumnListForFilters?.length) {
139-
if (item.ColumnType !== ColumnTypeEnums.Text) {
139+
if (item.ColumnType !== ColumnTypeEnums.Text && item.ColumnType !== ColumnTypeEnums.TikoType) {
140140
if (item.ColumnType === ColumnTypeEnums.EncryptedData) {
141141
if (val.length) return true
142142
} else if (item.ColumnType === ColumnTypeEnums.Base36Id) {
@@ -170,7 +170,11 @@ const MultipleCheck = ({
170170
if (elem === '') {
171171
return emptyValue
172172
}
173-
if (item.ColumnType !== ColumnTypeEnums.Text && item.ColumnType !== ColumnTypeEnums.Base36Id) {
173+
if (
174+
item.ColumnType !== ColumnTypeEnums.Text &&
175+
item.ColumnType !== ColumnTypeEnums.TikoType &&
176+
item.ColumnType !== ColumnTypeEnums.Base36Id
177+
) {
174178
return elem + ''
175179
}
176180
return elem

src/table/MainHeader/Filter/FiltersPerColumn/apiFilter.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ const APIFilter = ({
6666
}
6767
return filterTyping.PropertyName
6868
}
69-
const listWithContains = [ColumnTypeEnums.Text, ColumnTypeEnums.TextCollection, ColumnTypeEnums.NumberCollection]
69+
const listWithContains = [
70+
ColumnTypeEnums.Text,
71+
ColumnTypeEnums.TikoType,
72+
ColumnTypeEnums.TextCollection,
73+
ColumnTypeEnums.NumberCollection,
74+
]
7075

7176
const handleChangeValue = (value: any) => {
7277
let columnFilter: ItemFields = {

src/utils/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@ const filterUiHelperMap = {
9898
Contains: 7,
9999
NotContains: 7,
100100
},
101+
TikoType: {
102+
Equal: 1,
103+
NotEqual: 1,
104+
StartsWith: 2,
105+
EndsWith: 2,
106+
Contains: 2,
107+
NotContains: 2,
108+
},
101109
} as const
102110

103111
export const filterUiHelper = (ColumnType: string, ComparisonType: string) => {

0 commit comments

Comments
 (0)