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

Feature/add id to th component #1097

Merged
merged 2 commits into from
Dec 27, 2023
Merged

Feature/add id to th component #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a49c31
feat(th.tsx): add id property to th tag
GuillaumeKESTEMAN Dec 22, 2023
1ec46d0
feat(table stories): add header ids to args
GuillaumeKESTEMAN Dec 22, 2023
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
76 changes: 48 additions & 28 deletions packages/table/src/Table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ const modifiers = [
univers.retraite,
univers.axa,
];
type TTableArgs = {
columnHeaderId: string;
firstRowHeaderId: string;
secondRowHeaderId: string;
};

export default {
title: 'Components/Table',
Expand All @@ -31,6 +36,11 @@ export default {
},
options: {},
},
args: {
columnHeaderId: 'col-header',
firstRowHeaderId: 'row-header-1',
secondRowHeaderId: 'row-header-2',
},
argTypes: {
classModifier: {
control: {
Expand All @@ -43,43 +53,48 @@ export default {
} as Meta;

type TableProps = ComponentProps<typeof Table>;
const Template: Story<TableProps> = (args) => (
const Template: Story<TableProps & TTableArgs> = ({
columnHeaderId,
firstRowHeaderId,
secondRowHeaderId,
...args
}) => (
<Table {...args}>
<Table.Header>
<Table.Tr>
<Table.Th colSpan={3}>
<Table.Th id={columnHeaderId} colSpan={3}>
<span className="af-table-th-content">Some text</span>
</Table.Th>
</Table.Tr>
</Table.Header>
<Table.Body>
<Table.Tr>
<Table.Td rowSpan={2}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
<Table.Td>
<Table.Th id={firstRowHeaderId} rowSpan={2}>
<span className="af-table-th-content">Some text</span>
</Table.Th>
<Table.Td headers={`${columnHeaderId} ${firstRowHeaderId}`}>
<b>Some balised text</b>
</Table.Td>
<Table.Td>
<Table.Td headers={`${columnHeaderId} ${firstRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
</Table.Tr>
<Table.Tr>
<Table.Td>
<Table.Td headers={`${columnHeaderId} ${firstRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
<Table.Td>
<Table.Td headers={`${columnHeaderId} ${firstRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
</Table.Tr>
<Table.Tr>
<Table.Td>
<span className="af-table-body-content">Some text</span>
</Table.Td>
<Table.Td>
<Table.Th id={secondRowHeaderId}>
<span className="af-table-th-content">Some text</span>
</Table.Th>
<Table.Td headers={`${columnHeaderId} ${secondRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
<Table.Td>
<Table.Td headers={`${columnHeaderId} ${secondRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
</Table.Tr>
Expand All @@ -91,44 +106,49 @@ export const TableStory: Story<TableProps> = Template.bind({});
TableStory.storyName = 'Simple';

type TableWithPagingProps = ComponentProps<typeof Table>;
const TemplateWithPaging: Story<TableProps> = (args) => (
const TemplateWithPaging: Story<TableProps & TTableArgs> = ({
columnHeaderId,
firstRowHeaderId,
secondRowHeaderId,
...args
}) => (
<>
<Table {...args}>
<Table.Header>
<Table.Tr>
<Table.Th colSpan={3}>
<Table.Th id={columnHeaderId} colSpan={3}>
<span className="af-table-th-content">Some text</span>
</Table.Th>
</Table.Tr>
</Table.Header>
<Table.Body>
<Table.Tr>
<Table.Td rowSpan={2}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
<Table.Td>
<Table.Th id={firstRowHeaderId} rowSpan={2}>
<span className="af-table-th-content">Some text</span>
</Table.Th>
<Table.Td headers={`${columnHeaderId} ${firstRowHeaderId}`}>
<b>Some balised text</b>
</Table.Td>
<Table.Td>
<Table.Td headers={`${columnHeaderId} ${firstRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
</Table.Tr>
<Table.Tr>
<Table.Td>
<Table.Td headers={`${columnHeaderId} ${firstRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
<Table.Td>
<Table.Td headers={`${columnHeaderId} ${firstRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
</Table.Tr>
<Table.Tr>
<Table.Td>
<span className="af-table-body-content">Some text</span>
</Table.Td>
<Table.Td>
<Table.Th id={secondRowHeaderId}>
<span className="af-table-th-content">Some text</span>
</Table.Th>
<Table.Td headers={`${columnHeaderId} ${secondRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
<Table.Td>
<Table.Td headers={`${columnHeaderId} ${secondRowHeaderId}`}>
<span className="af-table-body-content">Some text</span>
</Table.Td>
</Table.Tr>
Expand Down
2 changes: 1 addition & 1 deletion packages/table/src/Th.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const Th = ({
'af-table__th'
);
return (
<th className={componentClassName} key={id} {...otherProps}>
<th className={componentClassName} key={id} id={id} {...otherProps}>
{children}
</th>
);
Expand Down