mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 17:11:17 -08:00
Fix visual items (#1114)
<!-- Please read https://github.com/SableClient/Sable/blob/dev/CONTRIBUTING.md before submitting your pull request --> ### Description Fix hovering over the favorite gif icon Fix color of over the presence and account-switch items in the user icon on the bottom left Add AVIF to the list of supported gif formats Add Favorite gif to the mobile context menu Fixes # #### Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ### Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have made corresponding changes to the documentation - [x] My changes generate no new warnings ### AI disclosure: - [ ] Partially AI assisted (clarify which code was AI assisted and briefly explain what it does). - [ ] Fully AI generated (explain what all the generated code does in moderate detail). <!-- Write any explanation required here, but do not generate the explanation using AI!! You must prove you understand what the code in this PR does. --> Written w the assistance of a very small fan
This commit is contained in:
9 files changed
+124
-22
No files matched your search
@@ -0,0 +1,5 @@
|
||||
---
|
||||
default: patch
|
||||
---
|
||||
|
||||
Various visual tweaks
|
||||
@@ -253,7 +253,7 @@ export function GifItem({
|
||||
>
|
||||
{menuIcon(Star, {
|
||||
weight: favorited ? 'fill' : 'regular',
|
||||
color: favorited ? color.Warning.MainHover : color.Surface.OnContainer,
|
||||
color: favorited ? color.Warning.MainHover : color.Secondary.OnContainer,
|
||||
})}
|
||||
</MenuItem>
|
||||
<MenuItem
|
||||
|
||||
@@ -116,7 +116,7 @@ export function BrokenContent({ body }: BrokenContentProps) {
|
||||
);
|
||||
}
|
||||
|
||||
function getIncomingMediaMxcUrl(url: unknown): string | undefined {
|
||||
export function getIncomingMediaMxcUrl(url: unknown): string | undefined {
|
||||
return typeof url === 'string' && url.startsWith('mxc://') ? url : undefined;
|
||||
}
|
||||
|
||||
|
||||
@@ -67,6 +67,24 @@ function thumbnailDimsForMaxEdge(
|
||||
};
|
||||
}
|
||||
|
||||
export function checkIfGif(url: string, mimetype?: string, body?: string) {
|
||||
return (
|
||||
mimetype === 'image/avif' ||
|
||||
mimetype === 'image/gif' ||
|
||||
mimetype === 'image/apng' ||
|
||||
mimetype === 'image/webp' ||
|
||||
(body ?? '').toLowerCase().endsWith('.avif') ||
|
||||
(body ?? '').toLowerCase().endsWith('.gif') ||
|
||||
(body ?? '').toLowerCase().endsWith('.apng') ||
|
||||
(body ?? '').toLowerCase().endsWith('.webp') ||
|
||||
url.toLowerCase().endsWith('.avif') ||
|
||||
url.toLowerCase().endsWith('.gif') ||
|
||||
url.toLowerCase().endsWith('.apng') ||
|
||||
url.toLowerCase().endsWith('.webp') ||
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
type RenderViewerProps = {
|
||||
src: string;
|
||||
alt: string;
|
||||
@@ -140,16 +158,7 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
favoritedContent.gifs.find((v) => v.url == url) != undefined
|
||||
);
|
||||
|
||||
const isGif =
|
||||
info?.mimetype === 'image/gif' ||
|
||||
info?.mimetype === 'image/apng' ||
|
||||
info?.mimetype === 'image/webp' ||
|
||||
(body ?? '').toLowerCase().endsWith('.gif') ||
|
||||
(body ?? '').toLowerCase().endsWith('.apng') ||
|
||||
(body ?? '').toLowerCase().endsWith('.webp') ||
|
||||
url.toLowerCase().endsWith('.gif') ||
|
||||
url.toLowerCase().endsWith('.apng') ||
|
||||
url.toLowerCase().endsWith('.webp');
|
||||
const isGif = checkIfGif(url, info?.mimetype, body);
|
||||
|
||||
const [srcState, loadSrc] = useAsyncCallback(
|
||||
useCallback(async () => {
|
||||
@@ -464,7 +473,7 @@ export const ImageContent = as<'div', ImageContentProps>(
|
||||
>
|
||||
{menuIcon(Star, {
|
||||
weight: favorited ? 'fill' : 'regular',
|
||||
color: favorited ? color.Warning.MainHover : color.Surface.OnContainer,
|
||||
color: favorited ? color.Warning.MainHover : color.Secondary.OnContainer,
|
||||
})}
|
||||
</MenuItem>
|
||||
)}
|
||||
|
||||
@@ -51,6 +51,10 @@ import {
|
||||
} from '$features/bookmarks';
|
||||
import { CopyIcon } from '@phosphor-icons/react';
|
||||
import * as OptionsCss from './Options.css';
|
||||
import { MATRIX_SABLE_UNSTABLE_FAVORITE_GIFS } from '$unstable/prefixes';
|
||||
import { useFavoriteGifs } from '$hooks/useFavoriteGifs';
|
||||
import type { IImageInfo } from '$types/matrix/common';
|
||||
import { getIncomingMediaMxcUrl } from '../MsgTypeRenderers';
|
||||
|
||||
function WrappedMessage({
|
||||
isModal,
|
||||
@@ -239,7 +243,9 @@ export const MessageBookmarkItem = as<
|
||||
return (
|
||||
<MenuItem
|
||||
size="300"
|
||||
after={menuIcon(BookmarkIcon)}
|
||||
after={menuIcon(BookmarkIcon, {
|
||||
weight: bookmarked ? 'fill' : 'regular',
|
||||
})}
|
||||
radii="300"
|
||||
onClick={handleClick}
|
||||
{...props}
|
||||
@@ -252,6 +258,70 @@ export const MessageBookmarkItem = as<
|
||||
);
|
||||
});
|
||||
|
||||
export const MessageFavoriteGifItem = as<
|
||||
'button',
|
||||
{
|
||||
room: Room;
|
||||
mEvent: MatrixEvent;
|
||||
onClose?: () => void;
|
||||
}
|
||||
>(({ room, mEvent, onClose, ...props }, ref) => {
|
||||
const mx = useMatrixClient();
|
||||
const content = mEvent.getContent();
|
||||
const url = getIncomingMediaMxcUrl(content.file?.url ?? content.url) ?? '';
|
||||
const favoritedContent = useFavoriteGifs();
|
||||
const [favorited, setFavorited] = useState(
|
||||
favoritedContent.gifs.find((v) => v.url == url) != undefined
|
||||
);
|
||||
const handleClick = async () => {
|
||||
if (!favorited) {
|
||||
const info: IImageInfo | undefined = content?.info;
|
||||
const body = content?.body;
|
||||
setFavorited(true);
|
||||
await mx
|
||||
.setAccountData(MATRIX_SABLE_UNSTABLE_FAVORITE_GIFS, {
|
||||
gifs: [
|
||||
...favoritedContent.gifs,
|
||||
{
|
||||
title: body ?? '',
|
||||
url: url,
|
||||
width: info?.w,
|
||||
height: info?.h,
|
||||
size: info?.size,
|
||||
mimetype: info?.mimetype,
|
||||
},
|
||||
],
|
||||
})
|
||||
.catch(() => setFavorited(false));
|
||||
} else {
|
||||
setFavorited(false);
|
||||
await mx
|
||||
.setAccountData(MATRIX_SABLE_UNSTABLE_FAVORITE_GIFS, {
|
||||
gifs: favoritedContent.gifs.filter((v) => v.url != url),
|
||||
})
|
||||
.catch(() => setFavorited(true));
|
||||
}
|
||||
|
||||
onClose?.();
|
||||
};
|
||||
return (
|
||||
<MenuItem
|
||||
size="300"
|
||||
after={menuIcon(Star, {
|
||||
weight: favorited ? 'fill' : 'regular',
|
||||
})}
|
||||
radii="300"
|
||||
onClick={handleClick}
|
||||
{...props}
|
||||
ref={ref}
|
||||
>
|
||||
<Text className={css.MessageMenuItemText} as="span" size="T300" truncate>
|
||||
{favorited ? 'Unfavorite Gif' : 'Favorite Gif'}
|
||||
</Text>
|
||||
</MenuItem>
|
||||
);
|
||||
});
|
||||
|
||||
export type OptionEmojiMenuProps = {
|
||||
mEvent: MatrixEvent;
|
||||
closeMenu: () => void;
|
||||
@@ -334,6 +404,7 @@ export function OptionQuickMenu({
|
||||
menuAnchor,
|
||||
imagePackRooms,
|
||||
setIsEmoji,
|
||||
isGif,
|
||||
}: OptionMenuProps) {
|
||||
const mx = useMatrixClient();
|
||||
const isThreadedMessage = isThreadRelationEvent(mEvent, mEvent.threadRootId);
|
||||
@@ -438,6 +509,7 @@ export function OptionQuickMenu({
|
||||
setIsEmoji={setIsEmoji}
|
||||
emojiBoardAnchor={menuAnchor}
|
||||
canSendReaction={canSendReaction}
|
||||
isGif={isGif}
|
||||
/>
|
||||
}
|
||||
>
|
||||
@@ -484,6 +556,7 @@ export type OptionMenuProps = {
|
||||
canDelete?: boolean;
|
||||
handleOpenMenu?: MouseEventHandler<HTMLButtonElement>;
|
||||
menuAnchor?: RectCords | undefined;
|
||||
isGif?: boolean;
|
||||
|
||||
emojiBoardAnchor?: RectCords;
|
||||
imagePackRooms?: Room[];
|
||||
@@ -511,6 +584,7 @@ export function OptionMenu({
|
||||
ActualMessage,
|
||||
isModal,
|
||||
dragOpts,
|
||||
isGif,
|
||||
}: OptionMenuProps) {
|
||||
const setModal = useSetAtom(modalAtom);
|
||||
const store = useStore();
|
||||
@@ -665,6 +739,9 @@ export function OptionMenu({
|
||||
{relations && (
|
||||
<MessageAllReactionItem room={room} relations={relations} closeMenu={closeMenu} />
|
||||
)}
|
||||
{isGif && isModal && (
|
||||
<MessageFavoriteGifItem room={room} mEvent={mEvent} onClose={closeMenu} />
|
||||
)}
|
||||
<MenuItem
|
||||
size="300"
|
||||
after={menuIcon(ArrowBendUpLeftIcon)}
|
||||
@@ -852,6 +929,7 @@ export function MobileOptionsInternal({ options }: { options: OptionMenuProps })
|
||||
canSendReaction={options.canSendReaction}
|
||||
isModal
|
||||
dragOpts={dragOpts}
|
||||
isGif={options.isGif}
|
||||
/>
|
||||
</Box>
|
||||
</Box>
|
||||
|
||||
@@ -114,9 +114,10 @@ function UserExtendedSection({
|
||||
|
||||
const catStatusText = useMemo(() => {
|
||||
if (!renderAnimals) return null;
|
||||
if (isAnimal && hasAnimal) return `${isAnimal} with ${hasAnimal}, give ${animalNeed}!`;
|
||||
if (isAnimal) return `Is ${isAnimal}, give ${animalNeed}!`;
|
||||
if (hasAnimal) return `Has ${hasAnimal}, give ${animalNeed}!`;
|
||||
const animalGive = animalNeed ? `, give ${animalNeed}!` : '!';
|
||||
if (isAnimal && hasAnimal) return `${isAnimal} with ${hasAnimal}${animalGive}`;
|
||||
if (isAnimal) return `Is ${isAnimal}${animalGive}`;
|
||||
if (hasAnimal) return `Has ${hasAnimal}${animalGive}`;
|
||||
return null;
|
||||
}, [renderAnimals, isAnimal, hasAnimal, animalNeed]);
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ import { useSetAtom } from 'jotai';
|
||||
import {
|
||||
AvatarBase,
|
||||
BubbleLayout,
|
||||
checkIfGif,
|
||||
CompactLayout,
|
||||
MessageBase,
|
||||
ModernLayout,
|
||||
@@ -382,6 +383,12 @@ function MessageInternal(
|
||||
const setModal = useSetAtom(modalAtom);
|
||||
const [contentVersion, setContentVersion] = useState(0);
|
||||
|
||||
const isGif = useMemo(() => {
|
||||
const content = mEvent.getContent();
|
||||
if (content.msgtype !== 'm.image') return false;
|
||||
return checkIfGif(content?.info?.url ?? '', content?.info?.mimetype, content?.body);
|
||||
}, [mEvent]);
|
||||
|
||||
useEffect(() => {
|
||||
const triggerTimelineRegroup = () => {
|
||||
// A Local Echo update seems to trigger a visual refresh without
|
||||
@@ -850,6 +857,7 @@ function MessageInternal(
|
||||
</div>
|
||||
),
|
||||
canSendReaction: canSendReaction,
|
||||
isGif: isGif,
|
||||
},
|
||||
});
|
||||
};
|
||||
@@ -946,6 +954,7 @@ function MessageInternal(
|
||||
imagePackRooms={imagePackRooms}
|
||||
setIsEmoji={setIsEmoji}
|
||||
canSendReaction={canSendReaction}
|
||||
isGif={isGif}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -242,8 +242,8 @@ export function ProfileMobile() {
|
||||
<Line variant="Surface" size="300" />
|
||||
<MenuItem
|
||||
size="300"
|
||||
variant="Background"
|
||||
style={{ color: color.Critical.OnContainer }}
|
||||
variant="Critical"
|
||||
fill="None"
|
||||
before={menuIcon(SignOutIcon)}
|
||||
onClick={() => setLogout(true)}
|
||||
>
|
||||
@@ -267,7 +267,7 @@ export function ProfileMobile() {
|
||||
</>
|
||||
)}
|
||||
</UseStateProvider>
|
||||
<div style={{ height: toRem(132) }} />
|
||||
<div style={{ height: '20vh' }} />
|
||||
</Box>
|
||||
</Menu>
|
||||
</Box>
|
||||
|
||||
@@ -277,7 +277,7 @@ export function AccountMenuOption({ isMobile, isRight }: { isMobile: boolean; is
|
||||
background: isMobile
|
||||
? color.Background.Container
|
||||
: isOpen
|
||||
? color.Secondary.Container
|
||||
? color.Surface.ContainerHover
|
||||
: color.Surface.Container,
|
||||
}}
|
||||
onClick={() => isMobile && setIsOpen(!isOpen)}
|
||||
@@ -501,7 +501,7 @@ export function PresenceMenuOption({
|
||||
background: isMobile
|
||||
? color.Background.Container
|
||||
: isOpen
|
||||
? color.Secondary.Container
|
||||
? color.Surface.ContainerHover
|
||||
: color.Surface.Container,
|
||||
}}
|
||||
onClick={() => isMobile && setIsOpen(!isOpen)}
|
||||
|
||||
Reference in new issue
Block a user