A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(app): show guild initials until the guild icon has painted (#1932)
Hampus919e89001155
diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListItemPresentation.tsx b/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListItemPresentation.tsxindex 400d6667a..136a2f52e 100644--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListItemPresentation.tsx+++ b/fluxer_app/src/features/app/components/layout/sidebar_nav/GuildListItemPresentation.tsx@@ -313,6 +313,7 @@ export const GuildListItemPresentation = forwardRef<[backgroundImage, draggingCursor],);const guildIconTarget = useMemo(() => ({borderRadius: iconBorderRadius}), [iconBorderRadius]);+ const hasPaintedIcon = backgroundImage != null;return (<LongPressable{...domProps}@@ -364,7 +365,7 @@ export const GuildListItemPresentation = forwardRef<tabIndex={-1}className={clsx(styles.guildIcon,- guild.icon == null && styles.guildIconNoImage,+ !hasPaintedIcon && styles.guildIconNoImage,isSelected && styles.guildIconSelected,)}to={guildIconTarget}@@ -374,7 +375,7 @@ export const GuildListItemPresentation = forwardRef<style={guildIconStyle}data-flx="app.sidebar-nav.guild-list-item-presentation.guild-icon">- {guild.icon == null && (+ {!hasPaintedIcon && (<spanclassName={styles.guildIconInitials}data-flx="app.sidebar-nav.guild-list-item-presentation.guild-icon-initials"diff --git a/fluxer_app/src/features/app/components/layout/sidebar_nav/UseGuildListItemInteraction.tsx b/fluxer_app/src/features/app/components/layout/sidebar_nav/UseGuildListItemInteraction.tsxindex b0b9c5daa..43385cbb3 100644--- a/fluxer_app/src/features/app/components/layout/sidebar_nav/UseGuildListItemInteraction.tsx+++ b/fluxer_app/src/features/app/components/layout/sidebar_nav/UseGuildListItemInteraction.tsx@@ -55,13 +55,6 @@ function resolveGuildIconBackgroundImage(iconURL: string, displayedIconURL: strireturn `url(${displayedIconURL})`;}-function resolveInitiallyLoadedImageURL(imageURL: string): string | null {- if (ImageCacheUtils.hasImage(imageURL)) {- return imageURL;- }- return null;-}-export function useGuildListItemInteraction({guild,isDesktopLayout,@@ -79,16 +72,16 @@ export function useGuildListItemInteraction({});const iconURL = AvatarSourceUtils.getGuildIconURL(guild, false);const hoverIconURL = AvatarSourceUtils.getGuildIconURL(guild, true);- const [loadedAnimatedURL, setLoadedAnimatedURL] = useState<string | null>(() =>- resolveInitiallyLoadedImageURL(hoverIconURL),- );+ const isAnimatableIcon = hoverIconURL !== iconURL;+ const [loadedAnimatedURL, setLoadedAnimatedURL] = useState<string | null>(null);const [bottomSheetOpen, setBottomSheetOpen] = useState(false);useEffect(() => ImageCacheUtils.pinImage(iconURL), [iconURL]);useEffect(() => {+ if (!isAnimatableIcon) return;if (!isHovering && !contextMenuOpen) return;if (loadedAnimatedURL === hoverIconURL) return;return ImageCacheUtils.loadImage(hoverIconURL, () => setLoadedAnimatedURL(hoverIconURL));- }, [contextMenuOpen, hoverIconURL, isHovering, loadedAnimatedURL]);+ }, [contextMenuOpen, hoverIconURL, isAnimatableIcon, isHovering, loadedAnimatedURL]);const handleSelect = useCallback(() => {markDirectSelection(DirectSelectionSurface.GUILD_RAIL);preloadChannelNow();@@ -126,7 +119,7 @@ export function useGuildListItemInteraction({if (!isSortingList && isMobileExperience) setBottomSheetOpen(true);}, [isMobileExperience, isSortingList]);const handleCloseBottomSheet = useCallback(() => setBottomSheetOpen(false), []);- const shouldPlayAnimated = (isHovering || contextMenuOpen) && loadedAnimatedURL === hoverIconURL;+ const shouldPlayAnimated = isAnimatableIcon && (isHovering || contextMenuOpen) && loadedAnimatedURL === hoverIconURL;const displayedIconURL = resolveDisplayedGuildIconURL({hoverIconURL, iconURL, shouldPlayAnimated});const backgroundImage = resolveGuildIconBackgroundImage(iconURL, displayedIconURL);return {