qugalet/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'emoji-fixes' into 'develop'

Browse source 
fix default values for emoji size calculations

See merge request pleroma/pleroma-fe!1960
This commit is contained in:
HJ 2024-12-28 14:44:21 +00:00
parent 9c10370e19 38c0856c20
commit 1ff3be579c
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/emoji_picker/emoji_picker.js
View file

@ -143,11 +143,11 @@ const EmojiPicker = {
const fontSize = css.getPropertyValue('font-size') const fontSize = css.getPropertyValue('font-size')
const emojiSize = css.getPropertyValue('--emojiSize') const emojiSize = css.getPropertyValue('--emojiSize')
const fontSizeUnit = fontSize.replace(/[0-9,.]+/, '') const fontSizeUnit = fontSize.replace(/[0-9,.]+/, '') || 'px'
const fontSizeValue = Number(fontSize.replace(/[^0-9,.]+/, '')) const fontSizeValue = Number(fontSize.replace(/[^0-9,.]+/, '')) || 14
const emojiSizeUnit = emojiSize.replace(/[0-9,.]+/, '') const emojiSizeUnit = emojiSize.replace(/[0-9,.]+/, '') || 'rem'
const emojiSizeValue = Number(emojiSize.replace(/[^0-9,.]+/, '')) const emojiSizeValue = Number(emojiSize.replace(/[^0-9,.]+/, '')) || 2.2
let fontSizeMultiplier let fontSizeMultiplier
if (fontSizeUnit.endsWith('em')) { if (fontSizeUnit.endsWith('em')) {
@ -155,8 +155,6 @@ const EmojiPicker = {
} else { } else {
fontSizeMultiplier = fontSizeValue / 14 fontSizeMultiplier = fontSizeValue / 14
} }
console.log('Multiplier', fontSizeMultiplier)
console.log('Result', fontSizeMultiplier * 14)
let emojiSizeReal let emojiSizeReal
if (emojiSizeUnit.endsWith('em')) { if (emojiSizeUnit.endsWith('em')) {