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

chore: replace MUI icons with Lucide icons - update 18#17958

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
BrunoQuaresma merged 3 commits intomainfrombq/replace-mui-icons-19
May 21, 2025
Merged
Show file tree
Hide file tree
Changes fromall 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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
import type { Theme } from "@emotion/react";
import { useTheme } from "@emotion/react";
import AppsIcon from "@mui/icons-material/Apps";
import InsertDriveFile from "@mui/icons-material/InsertDriveFile";
import CircularProgress from "@mui/material/CircularProgress";
import type {
WorkspaceAppStatus as APIWorkspaceAppStatus,
Workspace,
WorkspaceAgent,
WorkspaceApp,
} from "api/typesGenerated";
import { CircleCheckIcon } from "lucide-react";
import { CircleAlertIcon } from "lucide-react";
import { TriangleAlertIcon } from "lucide-react";
import { ExternalLinkIcon } from "lucide-react";
import {
CircleAlertIcon,
CircleCheckIcon,
ExternalLinkIcon,
FileIcon,
LayoutGridIcon,
TriangleAlertIcon,
} from "lucide-react";
import { useAppLink } from "modules/apps/useAppLink";
import type { FC } from "react";

Expand DownExpand Up@@ -163,11 +165,11 @@ export const WorkspaceAppStatus = ({
...commonStyles,
}}
>
<InsertDriveFile
sx={{
fontSize: "11px",
<FileIcon
className="size-icon-xs"
css={{
opacity: 0.5,
mr: 0.25,
marginRight: "0.25rem",
Comment on lines +168 to +172
Copy link
Member

Choose a reason for hiding this comment

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

Genuine question: Is there a reason why this wasn't switched over to Tailwind syntax? I know some of the icon libraries can be a little finicky with styling

Copy link
Member

Choose a reason for hiding this comment

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

Actually, wait, does this work as intended? I know that when you give a component acss prop, Emotion injects it viaclassName. Does Emotion take the existingclassName and merge it with its version ofclassName, or does it override the value?

}}
/>
<span>{formatURI(status.uri)}</span>
Expand DownExpand Up@@ -262,9 +264,9 @@ const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
}}
/>
) : (
<AppsIcon
sx={{
fontSize: 14,
<LayoutGridIcon
className="size-icon-xs"
css={{
Copy link
Member

Choose a reason for hiding this comment

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

Another potential area wherecss can be removed

opacity: 0.7,
}}
/>
Expand Down
12 changes: 7 additions & 5 deletionssite/src/pages/ChatPage/ChatToolInvocation.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,17 +3,19 @@ import { useTheme } from "@emotion/react";
import ArticleIcon from "@mui/icons-material/Article";
import BuildIcon from "@mui/icons-material/Build";
import CodeIcon from "@mui/icons-material/Code";
import DeleteIcon from "@mui/icons-material/Delete";
import FileUploadIcon from "@mui/icons-material/FileUpload";
import PersonIcon from "@mui/icons-material/Person";
import SettingsIcon from "@mui/icons-material/Settings";
import CircularProgress from "@mui/material/CircularProgress";
import Tooltip from "@mui/material/Tooltip";
import type * as TypesGen from "api/typesGenerated";
import { Avatar } from "components/Avatar/Avatar";
import { CircleCheckIcon } from "lucide-react";
import { CircleAlertIcon } from "lucide-react";
import { InfoIcon } from "lucide-react";
import {
CircleAlertIcon,
CircleCheckIcon,
InfoIcon,
TrashIcon,
} from "lucide-react";
import type React from "react";
import { type FC, memo, useMemo, useState } from "react";
import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
Expand DownExpand Up@@ -539,7 +541,7 @@ const ChatToolInvocationResultPreview: FC<{
color: theme.palette.text.secondary,
}}
>
<DeleteIcon fontSize="small" />
<TrashIcon className="size-icon-xs" />
{toolInvocation.result}
</div>
);
Expand Down
8 changes: 4 additions & 4 deletionssite/src/pages/HealthPage/DERPRegionPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
import TagOutlined from "@mui/icons-material/TagOutlined";
import Tooltip from "@mui/material/Tooltip";
import type {
DERPNodeReport,
Expand All@@ -9,8 +8,7 @@ import type {
HealthcheckReport,
} from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { ChevronLeftIcon } from "lucide-react";
import { CodeIcon } from "lucide-react";
import { ChevronLeftIcon, CodeIcon, HashIcon } from "lucide-react";
import type { FC } from "react";
import { Helmet } from "react-helmet-async";
import { Link, useOutletContext, useParams } from "react-router-dom";
Expand DownExpand Up@@ -92,7 +90,9 @@ const DERPRegionPage: FC = () => {
<section>
<div css={{ display: "flex", flexWrap: "wrap", gap: 12 }}>
<Tooltip title="Region ID">
<Pill icon={<TagOutlined />}>{region!.RegionID}</Pill>
<Pill icon={<HashIcon className="size-icon-sm" />}>
{region!.RegionID}
</Pill>
</Tooltip>
<Tooltip title="Region Code">
<Pill icon={<CodeIcon className="size-icon-sm" />}>
Expand Down
6 changes: 4 additions & 2 deletionssite/src/pages/HealthPage/WorkspaceProxyPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { useTheme } from "@emotion/react";
import PublicOutlined from "@mui/icons-material/PublicOutlined";
import TagOutlined from "@mui/icons-material/TagOutlined";
import Tooltip from "@mui/material/Tooltip";
import type { HealthcheckReport } from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { HashIcon } from "lucide-react";
import type { FC } from "react";
import { Helmet } from "react-helmet-async";
import { useOutletContext } from "react-router-dom";
Expand DownExpand Up@@ -118,7 +118,9 @@ const WorkspaceProxyPage: FC = () => {
)}
{region.version && (
<Tooltip title="Version">
<Pill icon={<TagOutlined />}>{region.version}</Pill>
<Pill icon={<HashIcon className="size-icon-sm" />}>
{region.version}
</Pill>
</Tooltip>
)}
{region.derp_enabled && (
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import UserIcon from "@mui/icons-material/PersonOutline";
import Checkbox from "@mui/material/Checkbox";
import Tooltip from "@mui/material/Tooltip";
import type { SlimRole } from "api/typesGenerated";
Expand All@@ -17,6 +16,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "components/deprecated/Popover/Popover";
import { UserIcon } from "lucide-react";
import { type FC, useEffect, useState } from "react";

const roleDescriptions: Record<string, string> = {
Expand DownExpand Up@@ -175,7 +175,7 @@ export const EditRolesButton: FC<EditRolesButtonProps> = ({
</fieldset>
<div className="p-6 border-t-1 border-solid border-border text-sm">
<div className="flex gap-4">
<UserIconclassName="size-icon-sm"/>
<UserIcon />
<div className="flex flex-col">
<strong>Member</strong>
<span className="text-xs text-content-secondary">
Expand Down
4 changes: 2 additions & 2 deletionssite/src/pages/UsersPage/UsersTable/UsersTableBody.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
import type { Interpolation, Theme } from "@emotion/react";
import DeleteIcon from "@mui/icons-material/Delete";
import GitHub from "@mui/icons-material/GitHub";
import HideSourceOutlined from "@mui/icons-material/HideSourceOutlined";
import KeyOutlined from "@mui/icons-material/KeyOutlined";
Expand DownExpand Up@@ -29,6 +28,7 @@ import {
} from "components/TableLoader/TableLoader";
import dayjs from "dayjs";
import relativeTime from "dayjs/plugin/relativeTime";
import { TrashIcon } from "lucide-react";
import { EllipsisVertical } from "lucide-react";
import type { FC } from "react";
import { UserRoleCell } from "../../OrganizationSettingsPage/UserTable/UserRoleCell";
Expand DownExpand Up@@ -236,7 +236,7 @@ export const UsersTableBody: FC<UsersTableBodyProps> = ({
onClick={() => onDeleteUser(user)}
disabled={user.id === actorID}
>
<DeleteIcon />
<TrashIcon className="size-icon-xs" />
Delete&hellip;
</DropdownMenuItem>
</DropdownMenuContent>
Expand Down
25 changes: 15 additions & 10 deletionssite/src/pages/WorkspacePage/AppStatuses.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
import type { Theme } from "@emotion/react";
import { useTheme } from "@emotion/react";
import AppsIcon from "@mui/icons-material/Apps";
import InsertDriveFile from "@mui/icons-material/InsertDriveFile";
import CircularProgress from "@mui/material/CircularProgress";
import Link from "@mui/material/Link";
import Tooltip from "@mui/material/Tooltip";
Expand All@@ -12,12 +10,16 @@ import type {
WorkspaceApp,
} from "api/typesGenerated";
import { formatDistance, formatDistanceToNow } from "date-fns";
import { CircleCheckIcon } from "lucide-react";
import { CircleAlertIcon } from "lucide-react";
import { TriangleAlertIcon } from "lucide-react";
import { ExternalLinkIcon } from "lucide-react";
import { HourglassIcon } from "lucide-react";
import { CircleHelpIcon } from "lucide-react";
import {
CircleAlertIcon,
CircleCheckIcon,
CircleHelpIcon,
ExternalLinkIcon,
FileIcon,
HourglassIcon,
LayoutGridIcon,
TriangleAlertIcon,
} from "lucide-react";
import { useAppLink } from "modules/apps/useAppLink";
import type { FC } from "react";

Expand DownExpand Up@@ -287,7 +289,10 @@ export const AppStatuses: FC<AppStatusesProps> = ({
},
}}
>
<InsertDriveFile sx={{ mr: 0.5 }} />
<FileIcon
className="size-icon-xs"
style={{ marginRight: "0.5rem" }}
/>
{formatURI(status.uri)}
</div>
</Tooltip>
Expand DownExpand Up@@ -397,7 +402,7 @@ const AppLink: FC<AppLinkProps> = ({ app, agent, workspace }) => {
style={{ borderRadius: "3px" }}
/>
) : (
<AppsIcon />
<LayoutGridIcon className="size-icon-xs" />
)}
{/* Keep app name short */}
<span
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp