Skip to content

BREAKING: TableCell layouts are handled by layout components #24762

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

Merged
ling1726 merged 24 commits into from
Sep 13, 2022
Merged

BREAKING: TableCell layouts are handled by layout components #24762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dba67ce
Add content wrapper and use native table styles
ling1726 Sep 11, 2022
1d5eee1
all table cell components to be items
ling1726 Sep 12, 2022
79c664b
fix single select stories
ling1726 Sep 12, 2022
7bc0200
fix selection cell styles
ling1726 Sep 12, 2022
38947ac
use unsized icons
ling1726 Sep 12, 2022
79efa14
fix vertical align for non native elements
ling1726 Sep 12, 2022
a7b0c37
remove user agent padding
ling1726 Sep 12, 2022
87d2b1b
fix unit tests
ling1726 Sep 12, 2022
3bda3f8
update md
ling1726 Sep 12, 2022
16ca1c1
changefile
ling1726 Sep 12, 2022
6bbf764
update vr test
ling1726 Sep 12, 2022
d5eb712
update unstable export
ling1726 Sep 13, 2022
01a3f69
update with layout components from #24773
ling1726 Sep 13, 2022
e2a724e
update md
ling1726 Sep 13, 2022
5094663
revert api extractor changes
ling1726 Sep 13, 2022
d7643c8
revert package.json
ling1726 Sep 13, 2022
0ee512e
revert
ling1726 Sep 13, 2022
fc82d0b
revert changes from react-components
ling1726 Sep 13, 2022
2a0726d
remove redundant file
ling1726 Sep 13, 2022
a762255
remove redundant file
ling1726 Sep 13, 2022
501adae
changefile
ling1726 Sep 13, 2022
0339fd9
fix vr tests
ling1726 Sep 13, 2022
4a749ca
add width 100% to header cell button
ling1726 Sep 13, 2022
c40aae4
apply padding to table header cell root
ling1726 Sep 13, 2022
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
244 changes: 153 additions & 91 deletions apps/vr-tests-react-components/src/stories/Table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import {
TableHeaderCell,
TableCell,
TableRow,
TablePrimaryCell,
TableCellLayout,
TableCellPrimaryLayout,
TableSelectionCell,
TableCellActions,
} from '@fluentui/react-table';
Expand Down Expand Up @@ -90,22 +91,28 @@ storiesOf('Table - cell actions', module)
<TableBody>
{items.map(item => (
<TableRow key={item.file.label} className="row">
<TableCell media={item.file.icon}>
{item.file.label}
<TableCellActions>
<Button icon={<EditRegular />} appearance="subtle" />
<Button icon={<MoreHorizontalRegular />} appearance="subtle" />
</TableCellActions>
<TableCell>
<TableCellLayout media={item.file.icon}>
{item.file.label}
<TableCellActions>
<Button icon={<EditRegular />} appearance="subtle" />
<Button icon={<MoreHorizontalRegular />} appearance="subtle" />
</TableCellActions>
</TableCellLayout>
</TableCell>
<TableCell
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
<TableCell>
<TableCellLayout
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -129,16 +136,24 @@ storiesOf('Table', module)
<TableBody>
{items.map(item => (
<TableRow key={item.file.label}>
<TableCell media={item.file.icon}>{item.file.label}</TableCell>
<TableCell
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
<TableCell>
<TableCellLayout media={item.file.icon}>{item.file.label}</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout>{item.lastUpdated.label}</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -158,20 +173,26 @@ storiesOf('Table', module)
<TableBody>
{items.map(item => (
<TableRow key={item.file.label}>
<TableCell media={item.file.icon}>{item.file.label}</TableCell>
<TableCell
media={
<Avatar
name={item.author.label}
size={24}
badge={{ status: item.author.status as PresenceBadgeStatus }}
/>
}
>
{item.author.label}
<TableCell>
<TableCellLayout media={item.file.icon}>{item.file.label}</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout
media={
<Avatar
name={item.author.label}
size={24}
badge={{ status: item.author.status as PresenceBadgeStatus }}
/>
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -189,20 +210,26 @@ storiesOf('Table', module)
<TableBody>
{items.map(item => (
<TableRow key={item.file.label}>
<TableCell media={item.file.icon}>{item.file.label}</TableCell>
<TableCell
media={
<Avatar
name={item.author.label}
size={20}
badge={{ status: item.author.status as PresenceBadgeStatus }}
/>
}
>
{item.author.label}
<TableCell>
<TableCellLayout media={item.file.icon}>{item.file.label}</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout
media={
<Avatar
name={item.author.label}
size={20}
badge={{ status: item.author.status as PresenceBadgeStatus }}
/>
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -220,14 +247,18 @@ storiesOf('Table', module)
<TableBody>
{items.map(item => (
<TableRow key={item.file.label}>
<TablePrimaryCell media={item.file.icon} main={item.file.label} secondary="Your organization" />
<TableCell
<TableCell>
<TableCellPrimaryLayout media={item.file.icon} main={item.file.label} secondary="Your organization" />
</TableCell>
<TableCellLayout
media={<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />}
>
{item.author.label}
</TableCell>
</TableCellLayout>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -249,16 +280,22 @@ storiesOf('Table', module)
{items.map(item => (
<TableRow key={item.file.label}>
<TableSelectionCell />
<TableCell media={item.file.icon}>{item.file.label}</TableCell>
<TableCell
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
<TableCell>
<TableCellLayout media={item.file.icon}>{item.file.label}</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -282,16 +319,22 @@ storiesOf('Table', module)
{items.map(item => (
<TableRow key={item.file.label}>
<TableSelectionCell checked={true} />
<TableCell media={item.file.icon}>{item.file.label}</TableCell>
<TableCell
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
<TableCell>
<TableCellLayout media={item.file.icon}>{item.file.label}</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -315,16 +358,22 @@ storiesOf('Table', module)
{items.map((item, i) => (
<TableRow key={item.file.label}>
<TableSelectionCell checked={!!(i % 2)} />
<TableCell media={item.file.icon}>{item.file.label}</TableCell>
<TableCell
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
<TableCell>
<TableCellLayout media={item.file.icon}>{item.file.label}</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -348,16 +397,22 @@ storiesOf('Table', module)
{items.map(item => (
<TableRow key={item.file.label}>
<TableSelectionCell type="radio" />
<TableCell media={item.file.icon}>{item.file.label}</TableCell>
<TableCell
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
<TableCell>
<TableCellLayout media={item.file.icon}>{item.file.label}</TableCellLayout>
</TableCell>
<TableCell>
<TableCellLayout
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand All @@ -381,16 +436,23 @@ storiesOf('Table', module)
{items.map((item, i) => (
<TableRow key={item.file.label}>
<TableSelectionCell type="radio" checked={i === 1} />
<TableCell media={item.file.icon}>{item.file.label}</TableCell>
<TableCell
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
<TableCell>
<TableCellLayout media={item.file.icon}>{item.file.label}</TableCellLayout>
</TableCell>

<TableCell>
<TableCellLayout
media={
<Avatar name={item.author.label} badge={{ status: item.author.status as PresenceBadgeStatus }} />
}
>
{item.author.label}
</TableCellLayout>
</TableCell>
<TableCell>{item.lastUpdated.label}</TableCell>
<TableCell media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCell>
<TableCell>
<TableCellLayout media={item.lastUpdate.icon}>{item.lastUpdate.label}</TableCellLayout>
</TableCell>
</TableRow>
))}
</TableBody>
Expand Down
7 changes: 7 additions & 0 deletions change/@fluentui-react-components-2046632a-d072-42f5-96ee-708958bc4c0c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: Stop exporting TablePrimaryCell and associated utilities and types",
"packageName": "@fluentui/react-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-table-4d5c0e81-f51c-477b-93ee-ed16314a396f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "BREAKING: TableCell layouts are handled by layout components",
"packageName": "@fluentui/react-table",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Loading