Skip to content

Fix emojis showing title instead of popup shortcode #2732

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

Open
aryanjassal wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix emojis showing title instead of popup shortcode #2732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 36 additions & 8 deletions src/app/plugins/react-custom-html-parser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,20 @@ import {
} from 'html-react-parser';
import { MatrixClient } from 'matrix-js-sdk';
import classNames from 'classnames';
import { Box, Chip, config, Header, Icon, IconButton, Icons, Scroll, Text, toRem } from 'folds';
import {
Box,
Chip,
config,
Header,
Icon,
IconButton,
Icons,
Scroll,
Text,
Tooltip,
TooltipProvider,
toRem,
} from 'folds';
import { IntermediateRepresentation, Opts as LinkifyOpts, OptFn } from 'linkifyjs';
import Linkify from 'linkify-react';
import { ErrorBoundary } from 'react-error-boundary';
Expand Down Expand Up @@ -169,13 +182,28 @@ export const scaleSystemEmoji = (text: string): (string | JSX.Element)[] =>
findAndReplace(
text,
EMOJI_REG_G,
(match, pushIndex) => (
<span key={`scaleSystemEmoji-${pushIndex}`} className={css.EmoticonBase}>
<span className={css.Emoticon()} title={getShortcodeFor(getHexcodeForEmoji(match[0]))}>
{match[0]}
</span>
</span>
),
(match, pushIndex) => {
const shortcode = getShortcodeFor(getHexcodeForEmoji(match[0])) ?? 'unknown';
return (
<TooltipProvider
key={`scaleSystemEmoji-${pushIndex}`}
position="Top"
tooltip={
<Tooltip style={{ maxWidth: toRem(200) }}>
<Text size="T300">:{shortcode}:</Text>
</Tooltip>
}
>
{(targetRef) => (
<span className={css.EmoticonBase}>
<span ref={targetRef} className={css.Emoticon()}>
{match[0]}
</span>
</span>
)}
</TooltipProvider>
);
},
(txt) => txt
);

Expand Down