Skip to content
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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FR-266] user profile hovering fix #59

Merged
merged 6 commits into from
Nov 26, 2024
Merged

[FR-266] user profile hovering fix #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a187958
fix: video embeds' proxy_url was not checked for null (#52)
JohnyTheCarrot Apr 18, 2024
661b584
v2.3.1
JohnyTheCarrot Apr 26, 2024
f701474
fix: fix reaction style inaccuracy
JohnyTheCarrot May 15, 2024
ba7f08c
refactor: make message author clickable
tylergeorges Oct 22, 2024
d9fef43
refactor: add clickable variant to username element
tylergeorges Oct 22, 2024
ecbdb58
Update package.json
mason-rogers Oct 29, 2024
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
4 changes: 2 additions & 2 deletions src/Content/Embed/EmbedVideo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ interface EmbedVideoProps
extends Required<Pick<APIEmbedVideo, "width" | "height">> {
thumbnail?: APIEmbedThumbnail["url"];
url: APIEmbedVideo["url"] | undefined;
proxyUrl: APIEmbedVideo["proxy_url"] | undefined;
proxyUrl: APIEmbedVideo["proxy_url"] | undefined | null;
}

function EmbedVideo(props: EmbedVideoProps) {
if (props.proxyUrl !== undefined)
if (props.proxyUrl)
return (
<ThumbnailWrapper
thumbnail={props.thumbnail}
Expand Down
27 changes: 18 additions & 9 deletions src/Message/MessageAuthor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import type { APIRole, APIUser, Snowflake } from "discord-api-types/v10";
import * as React from "react";
import type { ComponentProps } from "react";
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import ChatTag from "../ChatTag";
import RoleIcon from "./RoleIcon";
import getAvatar from "../utils/getAvatar";
import * as Styles from "./style/author";
import type { APIRole, APIUser, Snowflake } from "discord-api-types/v10";
import { useConfig } from "../core/ConfigContext";
import getAvatar from "../utils/getAvatar";
import getDisplayName from "../utils/getDisplayName";
import { useTranslation } from "react-i18next";
import RoleIcon from "./RoleIcon";
import * as Styles from "./style/author";

interface AutomodAuthorProps {
isAvatarAnimated?: boolean;
Expand Down Expand Up @@ -96,14 +96,19 @@ function MessageAuthor({
return color > 0 ? `#${color.toString(16).padStart(6, "0")}` : undefined;
}, [isGuildMember, resolveRole, member]);

const clickable = userOnClick !== undefined;

if (onlyShowUsername) {
return (
<Styles.MessageAuthor
clickable={userOnClick !== undefined}
clickable={clickable}
{...props}
onClick={() => userOnClick?.(author)}
>
<Styles.Username style={{ color: dominantRoleColor }}>
<Styles.Username
clickable={clickable}
style={{ color: dominantRoleColor }}
>
{displayName}
</Styles.Username>
</Styles.MessageAuthor>
Expand All @@ -112,7 +117,7 @@ function MessageAuthor({

return (
<Styles.MessageAuthor
clickable={userOnClick !== undefined}
clickable={clickable}
{...props}
onClick={() => userOnClick?.(author)}
>
Expand Down Expand Up @@ -150,9 +155,13 @@ function MessageAuthor({
</Styles.AnimatedAvatar>
)}
</Styles.AnimatedAvatarTrigger>
<Styles.Username style={{ color: dominantRoleColor }}>
<Styles.Username
clickable={clickable}
style={{ color: dominantRoleColor }}
>
{displayName}
</Styles.Username>

{dominantRoleIconRole !== null && (
<RoleIcon role={dominantRoleIconRole} />
)}
Expand Down
2 changes: 1 addition & 1 deletion src/Message/Reactions/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const Reaction = styled.withConfig({
display: "flex",
flexDirection: "row",
alignItems: "center",
padding: `${theme.space.small} ${theme.space.medium}`,
padding: `${theme.space.xs} ${theme.space.medium}`,
borderRadius: 8,
cursor: "not-allowed",
backgroundColor: theme.colors.backgroundSecondary,
Expand Down
8 changes: 7 additions & 1 deletion src/Message/style/author.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export const MessageAuthor = styled.withConfig({
true: {
"&:hover": {
cursor: "pointer",
textDecoration: "underline",
},
},
},
Expand All @@ -35,6 +34,13 @@ export const Username = styled.withConfig({
lineHeight: `1.375rem`,

variants: {
clickable: {
true: {
"&:hover": {
textDecoration: "underline",
},
},
},
automod: {
true: {
color: theme.colors.automodUsername,
Expand Down