Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,5 @@ go/keybase_netbsd
go/keybase_openbsd

.cursor
.claude
CLAUDE.md
9 changes: 5 additions & 4 deletions shared/chat/conversation/messages/react-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,15 @@ const ReactButtonContainer = React.memo(function ReactButtonContainer(p: OwnProp
const markdownOverride: StyleOverride = Kb.Styles.isMobile
? {
customEmoji: {
height: 24,
transform: [{translateY: C.isAndroid ? 0 : 3.5}],
width: 24,
height: 20,
transform: [{translateY: 4}],
width: 20,
},
emoji: {
lineHeight: C.isAndroid ? 26 : 28.5,
fontSize: 15,
},
emojiSize: {size: 24},
paragraph: C.isAndroid ? ({height: 28, textAlignVertical: 'center'} as StyleOverride['paragraph']) : {},
}
: {
customEmoji: {height: 18, width: 18},
Expand Down
12 changes: 7 additions & 5 deletions shared/common-adapters/emoji/native-emoji.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,22 @@ import Text from '../text'

import type {Props} from './native-emoji'

const familyOverride = isAndroid ? {fontFamily: ''} : {}

const sizes = [16, 18, 22, 24, 26, 28, 32, 36] as const
const sizeStyle = new Map<(typeof sizes)[number], Styles.StylesCrossPlatform>(
sizes.map(size => [size, {fontSize: size - 2, lineHeight: undefined, ...familyOverride}])
sizes.map(size => [size, {fontSize: size - 2, lineHeight: undefined}])
)

// Android fails to paint emoji glyphs in mixed-content Text nodes when the
// variant selector (VS16 / U+FE0F) is appended to codepoints that already
// have Emoji_Presentation. iOS and desktop handle it fine.
const emojiVariantSuffix = isAndroid ? '' : '\ufe0f'

const EmojiWrapper = React.memo(function EmojiWrapper(props: Props) {
const {emojiName, size} = props
const emojiVariantSuffix = '\ufe0f' // see http://mts.io/2015/04/21/unicode-symbol-render-text-emoji/
return (
<Text
type="Body"
style={Styles.collapseStyles([sizeStyle.get(size), props.style])} // Mobile emoji need to be smaller with Proxima Nova
style={Styles.collapseStyles([sizeStyle.get(size), props.style])}
allowFontScaling={props.allowFontScaling}
>
{emojiIndexByName[emojiName] ? emojiIndexByName[emojiName] + emojiVariantSuffix : emojiName}
Expand Down