11import { SymbolView } from "./AppSymbol" ;
2+ import { useAtomValue } from "@effect/atom-react" ;
23import { Image } from "expo-image" ;
3- import { useLayoutEffect , useMemo , useState } from "react" ;
4+ import { useLayoutEffect , useMemo , useState , useSyncExternalStore } from "react" ;
45import { View } from "react-native" ;
56import type { EnvironmentId } from "@t3tools/contracts" ;
7+ import { derivePhysicalProjectKeyFromPath } from "@t3tools/client-runtime/state/project-grouping" ;
8+ import {
9+ forgetProjectFavicon ,
10+ getRememberedProjectFavicon ,
11+ planProjectFaviconRender ,
12+ projectFaviconMemoryVersion ,
13+ rememberProjectFavicon ,
14+ subscribeProjectFaviconMemory ,
15+ } from "@t3tools/client-runtime/state/project-favicon" ;
616import {
717 getProjectFaviconCacheKey ,
818 isProjectFaviconFallbackUrl ,
919} from "@t3tools/shared/projectFavicon" ;
1020import { useThemeColor } from "../lib/useThemeColor" ;
1121import { useAssetUrl } from "../state/assets" ;
22+ import { projectFaviconSourcesAtom } from "../state/projects" ;
1223import {
1324 beginProjectFaviconRequest ,
1425 createProjectFaviconRequest ,
@@ -18,6 +29,12 @@ import {
1829} from "./projectFaviconCache" ;
1930
2031/* ─── Component ──────────────────────────────────────────────────────── */
32+ /**
33+ * Renders a project's icon by repository identity: every row of a repo group
34+ * asks the same source environment for the same file, the last loaded icon is
35+ * remembered for the session so a dropped connection never blanks it, and the
36+ * row's own environment is the last resort before the folder glyph.
37+ */
2138export function ProjectFavicon ( props : {
2239 readonly environmentId : EnvironmentId ;
2340 readonly open ?: boolean ;
@@ -27,27 +44,57 @@ export function ProjectFavicon(props: {
2744 readonly faviconPath ?: string | null ;
2845} ) {
2946 const size = props . size ?? 42 ;
30- const faviconUrl = useAssetUrl (
31- props . environmentId ,
32- props . workspaceRoot === null || props . workspaceRoot === undefined
47+ const workspaceRoot = props . workspaceRoot ?? null ;
48+ const physicalKey =
49+ workspaceRoot === null
50+ ? null
51+ : derivePhysicalProjectKeyFromPath ( props . environmentId , workspaceRoot ) ;
52+ const faviconSources = useAtomValue ( projectFaviconSourcesAtom ) ;
53+ const source = ( physicalKey === null ? null : faviconSources . get ( physicalKey ) ) ?? null ;
54+ const iconKey = source ?. iconKey ?? physicalKey ;
55+
56+ const faviconResource = ( cwd : string , faviconPath : string | null ) =>
57+ ( {
58+ _tag : "project-favicon" ,
59+ cwd,
60+ ...( faviconPath ? { path : faviconPath } : { } ) ,
61+ } ) as const ;
62+ const sourceUrl = useAssetUrl (
63+ source ?. environmentId ?? props . environmentId ,
64+ workspaceRoot === null
3365 ? null
34- : {
35- _tag : "project-favicon" ,
36- cwd : props . workspaceRoot ,
37- ...( props . faviconPath ? { path : props . faviconPath } : { } ) ,
38- } ,
66+ : faviconResource (
67+ source ?. cwd ?? workspaceRoot ,
68+ source ? source . faviconPath : ( props . faviconPath ?? null ) ,
69+ ) ,
3970 ) ;
40- const renderableFaviconUrl = isProjectFaviconFallbackUrl ( faviconUrl ) ? null : faviconUrl ;
41- const cacheKey =
42- renderableFaviconUrl && props . workspaceRoot
43- ? getProjectFaviconCacheKey ( props . environmentId , props . workspaceRoot , renderableFaviconUrl )
71+ const ownUrl = useAssetUrl (
72+ props . environmentId ,
73+ workspaceRoot === null ? null : faviconResource ( workspaceRoot , props . faviconPath ?? null ) ,
74+ ) ;
75+ useSyncExternalStore ( subscribeProjectFaviconMemory , projectFaviconMemoryVersion ) ;
76+
77+ const liveOf = ( url : string | null , environmentId : EnvironmentId , cwd : string | null ) =>
78+ url !== null && cwd !== null && ! isProjectFaviconFallbackUrl ( url )
79+ ? { url, cacheKey : getProjectFaviconCacheKey ( environmentId , cwd , url ) }
4480 : null ;
81+ const plan = planProjectFaviconRender ( {
82+ sourceLive : liveOf (
83+ sourceUrl ,
84+ source ?. environmentId ?? props . environmentId ,
85+ source ?. cwd ?? workspaceRoot ,
86+ ) ,
87+ ownLive : liveOf ( ownUrl , props . environmentId , workspaceRoot ) ,
88+ remembered : iconKey === null ? null : getRememberedProjectFavicon ( iconKey ) ,
89+ } ) ;
4590
4691 return (
4792 < ProjectFaviconImage
48- key = { cacheKey }
49- cacheKey = { cacheKey }
50- faviconUrl = { renderableFaviconUrl }
93+ key = { plan ?. cacheKey ?? null }
94+ cacheKey = { plan ?. cacheKey ?? null }
95+ iconKey = { iconKey }
96+ faviconUrl = { plan ?. url ?? null }
97+ remember = { plan ?. remember ?? false }
5198 open = { props . open }
5299 projectTitle = { props . projectTitle }
53100 size = { size }
@@ -57,7 +104,9 @@ export function ProjectFavicon(props: {
57104
58105function ProjectFaviconImage ( props : {
59106 readonly cacheKey : string | null ;
107+ readonly iconKey : string | null ;
60108 readonly faviconUrl : string | null ;
109+ readonly remember : boolean ;
61110 readonly open ?: boolean ;
62111 readonly projectTitle : string ;
63112 readonly size : number ;
@@ -122,10 +171,19 @@ function ProjectFaviconImage(props: {
122171 contentFit = "contain"
123172 onLoad = { ( ) => {
124173 if ( ! markProjectFaviconLoaded ( faviconRequest ) ) return ;
174+ if ( props . remember && props . iconKey !== null ) {
175+ rememberProjectFavicon ( props . iconKey , {
176+ url : faviconRequest . faviconUrl ,
177+ cacheKey : faviconRequest . cacheKey ,
178+ } ) ;
179+ }
125180 setStatus ( "loaded" ) ;
126181 } }
127182 onError = { ( ) => {
128183 if ( ! markProjectFaviconFailed ( faviconRequest ) ) return ;
184+ if ( props . iconKey !== null ) {
185+ forgetProjectFavicon ( props . iconKey , faviconRequest . faviconUrl ) ;
186+ }
129187 setStatus ( "error" ) ;
130188 } }
131189 />
0 commit comments