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.

Sign up for GitHub

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

chore: add generic typing to table component #259

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4693954
chore: add generic typing to table component
jared-dickman Jun 3, 2024
317d659
update default type
jared-dickman Jun 3, 2024
e0a84f5
update imports
jared-dickman Jun 4, 2024
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
View file
Open in desktop
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/lib/_util/type'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it matter if we mix imports from antd/es and antd/lib? I know this is only a type, I'm wondering how this transpiles, though. I was reading about type imports the other day and I think this transpiles to:

import { } from 'antd/lib/_util/type

This is minor, just asking if you knew how it all works, I don't really.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i also dont really 😩 but we seem to mostly use /es
ive changed this and the one other /lib import to be consistent with the rest of the project

image

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 = any> extends AntTableProps<RecordType> {}

export type { ColumnType, ExpandableConfig, ColumnsType, TableProps }

export const Table = (props: ITableProps) => {
export const Table = <RecordType extends AnyObject = any>(props: ITableProps<RecordType>) => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh boy AnyObject that has any as a default. That's too many any's 😄

Jokes aside, can we do the same as Antd and use AnyObject = AnyObject?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure thing, i got this from node_modules/antd/es/table/InternalTable.d.ts:10 but your link seems legit
image

return (
<ConfigProvider>
<AntTable {...props} />
<AntTable<RecordType> {...props} />
</ConfigProvider>
)
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/data-entry/QueryItem/Cascader.stories.tsx
View file
Open in desktop
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