Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
30 changes: 25 additions & 5 deletions apps/web/src/components/ProjectFavicon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { EnvironmentId } from "@t3tools/contracts";
import { isProjectFaviconFallbackUrl } from "@t3tools/shared/projectFavicon";
import { FolderIcon } from "lucide-react";
import type { ComponentType } from "react";
import { useState } from "react";
import { useAssetUrl } from "../assets/assetUrls";

Expand All @@ -10,37 +11,56 @@ export function ProjectFavicon(input: {
environmentId: EnvironmentId;
cwd: string;
className?: string | undefined;
fallbackIcon?: ComponentType<{ className?: string }>;
}) {
const src = useAssetUrl(input.environmentId, {
_tag: "project-favicon",
cwd: input.cwd,
});
const FallbackIcon = input.fallbackIcon ?? FolderIcon;

if (!src || isProjectFaviconFallbackUrl(src)) {
return <ProjectFaviconFallback className={input.className} />;
return <ProjectFaviconFallback className={input.className} icon={FallbackIcon} />;
}

return <ProjectFaviconImage key={src} src={src} className={input.className} />;
return (
<ProjectFaviconImage
key={src}
src={src}
className={input.className}
fallbackIcon={FallbackIcon}
/>
);
}

function ProjectFaviconFallback({ className }: { readonly className?: string | undefined }) {
return <FolderIcon className={`size-3.5 shrink-0 text-muted-foreground/50 ${className ?? ""}`} />;
function ProjectFaviconFallback({
className,
icon: Icon,
}: {
readonly className?: string | undefined;
readonly icon: ComponentType<{ className?: string }>;
}) {
return <Icon className={`size-3.5 shrink-0 text-muted-foreground/50 ${className ?? ""}`} />;
}

function ProjectFaviconImage({
src,
className,
fallbackIcon: FallbackIcon,
}: {
readonly src: string;
readonly className?: string | undefined;
readonly fallbackIcon: ComponentType<{ className?: string }>;
}) {
const [status, setStatus] = useState<"loading" | "loaded" | "error">(() =>
loadedProjectFaviconSrcs.has(src) ? "loaded" : "loading",
);

return (
<>
{status !== "loaded" ? <ProjectFaviconFallback className={className} /> : null}
{status !== "loaded" ? (
<ProjectFaviconFallback className={className} icon={FallbackIcon} />
) : null}
Comment thread
cursor[bot] marked this conversation as resolved.
<img
src={src}
alt=""
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/components/SidebarV2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
CircleDashedIcon,
CloudIcon,
FolderPlusIcon,
MessageSquareIcon,
PlusIcon,
SearchIcon,
SquarePenIcon,
Expand Down Expand Up @@ -426,6 +427,7 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
environmentId={thread.environmentId}
cwd={props.projectCwd ?? ""}
className="size-3.5"
fallbackIcon={MessageSquareIcon}
/>
</span>
{title}
Expand Down
Loading