ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emoji Status: Fix styles (#4765)

Browse Source
This commit is contained in:
zubiden 2024-08-06 20:05:56 +02:00 committed by Alexander Zinchuk
parent f28f04989d
commit 3a9e088bbd
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/common/CustomEmojiPicker.tsx
View File

@ -93,6 +93,7 @@ const HEADER_BUTTON_WIDTH = 2.5 * REM; // px (including margin)
const DEFAULT_ID_PREFIX = 'custom-emoji-set'; const DEFAULT_ID_PREFIX = 'custom-emoji-set';
const TOP_REACTIONS_COUNT = 16; const TOP_REACTIONS_COUNT = 16;
const RECENT_REACTIONS_COUNT = 32; const RECENT_REACTIONS_COUNT = 32;
const RECENT_DEFAULT_STATUS_COUNT = 7;
const FADED_BUTTON_SET_IDS = new Set([RECENT_SYMBOL_SET_ID, FAVORITE_SYMBOL_SET_ID, POPULAR_SYMBOL_SET_ID]); const FADED_BUTTON_SET_IDS = new Set([RECENT_SYMBOL_SET_ID, FAVORITE_SYMBOL_SET_ID, POPULAR_SYMBOL_SET_ID]);
const STICKER_SET_IDS_WITH_COVER = new Set([ const STICKER_SET_IDS_WITH_COVER = new Set([
RECENT_SYMBOL_SET_ID, RECENT_SYMBOL_SET_ID,
@ -222,7 +223,9 @@ const CustomEmojiPicker: FC<OwnProps & StateProps> = ({
} else if (isStatusPicker) { } else if (isStatusPicker) {
const defaultStatusIconsPack = stickerSetsById[defaultStatusIconsId!]; const defaultStatusIconsPack = stickerSetsById[defaultStatusIconsId!];
if (defaultStatusIconsPack?.stickers?.length) { if (defaultStatusIconsPack?.stickers?.length) {
const stickers = (defaultStatusIconsPack.stickers || []).concat(recentCustomEmojis || []); const stickers = defaultStatusIconsPack.stickers
.slice(0, RECENT_DEFAULT_STATUS_COUNT)
.concat(recentCustomEmojis || []);
defaultSets.push({ defaultSets.push({
...defaultStatusIconsPack, ...defaultStatusIconsPack,
stickers, stickers,

2
src/components/common/StickerButton.scss
View File

@ -22,7 +22,7 @@
&.status-default { &.status-default {
font-size: 2rem; font-size: 2rem;
padding: 0.25rem; padding: 0.125rem;
color: var(--color-text); color: var(--color-text);
} }
} }

2
src/components/common/StickerSet.tsx
View File

@ -243,7 +243,7 @@ const StickerSet: FC<OwnProps> = ({
const [isCut, , expand] = useFlag(canCut); const [isCut, , expand] = useFlag(canCut);
const itemsBeforeCutout = itemsPerRow * 3 - 1; const itemsBeforeCutout = itemsPerRow * 3 - 1;
const totalItemsCount = withDefaultTopicIcon ? stickerSet.count + 1 : stickerSet.count; const totalItemsCount = (withDefaultTopicIcon || withDefaultStatusIcon) ? stickerSet.count + 1 : stickerSet.count;
const itemHeight = itemSize + verticalMargin; const itemHeight = itemSize + verticalMargin;
const heightWhenCut = Math.ceil(Math.min(itemsBeforeCutout, totalItemsCount) / itemsPerRow) const heightWhenCut = Math.ceil(Math.min(itemsBeforeCutout, totalItemsCount) / itemsPerRow)