Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add generic typing to table component #259

Merged
merged 3 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/components/data-display/Table/Table.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import { Table as AntTable } from 'antd'
import { type TableProps as AntTableProps } from 'antd'
import { type AnyObject } from 'antd/es/_util/type'
import { ConfigProvider } from 'src/components'
import { type ColumnType, type ExpandableConfig } from 'antd/es/table/interface'
import { type ColumnsType, type TableProps } from 'antd/es/table'

export interface ITableProps extends AntTableProps {}
export interface ITableProps<RecordType extends AnyObject = AnyObject> extends AntTableProps<RecordType> {}

export type { ColumnType, ExpandableConfig, ColumnsType, TableProps }

export const Table = (props: ITableProps) => {
export const Table = <RecordType extends AnyObject = AnyObject>(props: ITableProps<RecordType>) => {
return (
<ConfigProvider>
<AntTable {...props} />
<AntTable<RecordType> {...props} />
</ConfigProvider>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/data-display/Tag/Tag.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Tag as AntTag } from 'antd'
import { type TagProps as AntTagProps } from 'antd'
import { type CheckableTagProps as AntCheckableTagProps } from 'antd/lib/tag'
import { type CheckableTagProps as AntCheckableTagProps } from 'antd/es/tag'
import { ConfigProvider } from 'src/components'

export interface ITagProps extends AntTagProps {
Expand Down
4 changes: 2 additions & 2 deletions src/components/data-entry/QueryItem/Cascader.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const Error: Story = {
},
}

export const Icon: Story = {
export const WithIcon: Story = {
args: {
placeholder: 'QueryItem.ValueSelector.Cascader Icon',
options: exampleOptions,
Expand Down Expand Up @@ -140,4 +140,4 @@ export const LoadData: Story = {
console.log(value)
},
},
}
}
Loading