Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit63a039a

Browse files
committed
chore: replace MUI tables
1 parent0e0f092 commit63a039a

File tree

29 files changed

+779
-825
lines changed

29 files changed

+779
-825
lines changed

‎biome.jsonc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"@mui/material/Typography":"Use native HTML elements instead. Eg: <span>, <p>, <h1>, etc.",
5353
"@mui/material/Box":"Use a <div> instead.",
5454
"@mui/material/styles":"Import from @emotion/react instead.",
55+
"@mui/material/Table*":"Import from components/Table/Table instead.",
5556
"lodash":"Use lodash/<name> instead."
5657
}
5758
}

‎site/src/components/Table/Table.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const TableBody = React.forwardRef<
4747
/>
4848
));
4949

50-
const_TableFooter=React.forwardRef<
50+
exportconstTableFooter=React.forwardRef<
5151
HTMLTableSectionElement,
5252
React.HTMLAttributes<HTMLTableSectionElement>
5353
>(({ className, ...props},ref)=>(

‎site/src/components/TableEmpty/TableEmpty.stories.tsx‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
importTablefrom"@mui/material/Table";
2-
importTableBodyfrom"@mui/material/TableBody";
3-
importTableContainerfrom"@mui/material/TableContainer";
41
importtype{Meta,StoryObj}from"@storybook/react-vite";
52
import{CodeExample}from"components/CodeExample/CodeExample";
3+
import{Table,TableBody}from"components/Table/Table";
64
import{TableEmpty}from"./TableEmpty";
75

86
constmeta:Meta<typeofTableEmpty>={
@@ -13,13 +11,11 @@ const meta: Meta<typeof TableEmpty> = {
1311
},
1412
decorators:[
1513
(Story)=>(
16-
<TableContainer>
17-
<Table>
18-
<TableBody>
19-
<Story/>
20-
</TableBody>
21-
</Table>
22-
</TableContainer>
14+
<Table>
15+
<TableBody>
16+
<Story/>
17+
</TableBody>
18+
</Table>
2319
),
2420
],
2521
};

‎site/src/components/TableEmpty/TableEmpty.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
importTableCellfrom"@mui/material/TableCell";
2-
importTableRowfrom"@mui/material/TableRow";
31
import{
42
EmptyState,
53
typeEmptyStateProps,
64
}from"components/EmptyState/EmptyState";
5+
import{TableCell,TableRow}from"components/Table/Table";
76
importtype{FC}from"react";
87

98
typeTableEmptyProps=EmptyStateProps;

‎site/src/components/TableLoader/TableLoader.stories.tsx‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
importTablefrom"@mui/material/Table";
2-
importTableBodyfrom"@mui/material/TableBody";
3-
importTableContainerfrom"@mui/material/TableContainer";
41
importtype{Meta,StoryObj}from"@storybook/react-vite";
2+
import{Table,TableBody}from"components/Table/Table";
53
import{TableLoader}from"./TableLoader";
64

75
constmeta:Meta<typeofTableLoader>={
86
title:"components/TableLoader",
97
component:TableLoader,
108
decorators:[
119
(Story)=>(
12-
<TableContainer>
13-
<Table>
14-
<TableBody>
15-
<Story/>
16-
</TableBody>
17-
</Table>
18-
</TableContainer>
10+
<Table>
11+
<TableBody>
12+
<Story/>
13+
</TableBody>
14+
</Table>
1915
),
2016
],
2117
};

‎site/src/components/TableLoader/TableLoader.tsx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
importTableCellfrom"@mui/material/TableCell";
2-
importTableRow,{typeTableRowProps}from"@mui/material/TableRow";
3-
import{cloneElement,typeFC,isValidElement,typeReactNode}from"react";
1+
import{TableCell,TableRow}from"components/Table/Table";
2+
import{
3+
typeComponentProps,
4+
cloneElement,
5+
typeFC,
6+
isValidElement,
7+
typeReactNode,
8+
}from"react";
49
import{Loader}from"../Loader/Loader";
510

611
exportconstTableLoader:FC=()=>{
@@ -36,7 +41,7 @@ export const TableLoaderSkeleton: FC<TableLoaderSkeletonProps> = ({
3641
);
3742
};
3843

39-
exportconstTableRowSkeleton:FC<TableRowProps>=({
44+
exportconstTableRowSkeleton:FC<ComponentProps<typeofTableRow>>=({
4045
children,
4146
...rowProps
4247
})=>{

‎site/src/components/Timeline/TimelineDateRow.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import{css,useTheme}from"@emotion/react";
2-
importTableCellfrom"@mui/material/TableCell";
3-
importTableRowfrom"@mui/material/TableRow";
2+
import{TableCell,TableRow}from"components/Table/Table";
43
importtype{FC}from"react";
54
import{createDisplayDate}from"./utils";
65

‎site/src/components/Timeline/TimelineEntry.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
importTableRow,{typeTableRowProps}from"@mui/material/TableRow";
2-
import{forwardRef}from"react";
1+
import{TableRow}from"components/Table/Table";
2+
import{typeComponentProps,forwardRef}from"react";
33
import{cn}from"utils/cn";
44

5-
interfaceTimelineEntryPropsextendsTableRowProps{
5+
interfaceTimelineEntryPropsextendsComponentProps<typeofTableRow>{
66
clickable?:boolean;
77
}
88

‎site/src/pages/AuditPage/AuditLogRow/AuditLogRow.stories.tsx‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,31 @@ import {
88
MockAuditLogWithWorkspaceBuild,
99
MockUserOwner,
1010
}from"testHelpers/entities";
11-
importTablefrom"@mui/material/Table";
12-
importTableBodyfrom"@mui/material/TableBody";
13-
importTableCellfrom"@mui/material/TableCell";
14-
importTableContainerfrom"@mui/material/TableContainer";
15-
importTableHeadfrom"@mui/material/TableHead";
16-
importTableRowfrom"@mui/material/TableRow";
1711
importtype{Meta,StoryObj}from"@storybook/react-vite";
12+
import{
13+
Table,
14+
TableBody,
15+
TableCell,
16+
TableHead,
17+
TableRow,
18+
}from"components/Table/Table";
1819
import{AuditLogRow}from"./AuditLogRow";
1920

2021
constmeta:Meta<typeofAuditLogRow>={
2122
title:"pages/AuditPage/AuditLogRow",
2223
component:AuditLogRow,
2324
decorators:[
2425
(Story)=>(
25-
<TableContainer>
26-
<Table>
27-
<TableHead>
28-
<TableRow>
29-
<TableCellstyle={{paddingLeft:32}}>Logs</TableCell>
30-
</TableRow>
31-
</TableHead>
32-
<TableBody>
33-
<Story/>
34-
</TableBody>
35-
</Table>
36-
</TableContainer>
26+
<Table>
27+
<TableHead>
28+
<TableRow>
29+
<TableCellstyle={{paddingLeft:32}}>Logs</TableCell>
30+
</TableRow>
31+
</TableHead>
32+
<TableBody>
33+
<Story/>
34+
</TableBody>
35+
</Table>
3736
),
3837
],
3938
};

‎site/src/pages/AuditPage/AuditLogRow/AuditLogRow.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
importtype{CSSObject,Interpolation,Theme}from"@emotion/react";
22
importCollapsefrom"@mui/material/Collapse";
33
importLinkfrom"@mui/material/Link";
4-
importTableCellfrom"@mui/material/TableCell";
54
importTooltipfrom"@mui/material/Tooltip";
65
importtype{AuditLog,BuildReason}from"api/typesGenerated";
76
import{Avatar}from"components/Avatar/Avatar";
87
import{DropdownArrow}from"components/DropdownArrow/DropdownArrow";
98
import{Stack}from"components/Stack/Stack";
109
import{StatusPill}from"components/StatusPill/StatusPill";
10+
import{TableCell}from"components/Table/Table";
1111
import{TimelineEntry}from"components/Timeline/TimelineEntry";
1212
import{InfoIcon,NetworkIcon}from"lucide-react";
1313
import{typeFC,useState}from"react";

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp