Merge branch 'emoji-picker-suspense' into 'main'

Wrap EmojiPicker with a Suspense boundary

See merge request soapbox-pub/soapbox!2786
environments/review-main-yi2y9f/deployments/4116
Alex Gleason 2023-10-10 16:17:25 +00:00
commit 8bedf92ec8
1 zmienionych plików z 18 dodań i 16 usunięć

Wyświetl plik

@ -1,5 +1,5 @@
import { Map as ImmutableMap } from 'immutable';
import React, { useEffect, useState, useLayoutEffect } from 'react';
import React, { useEffect, useState, useLayoutEffect, Suspense } from 'react';
import { defineMessages, useIntl } from 'react-intl';
import { createSelector } from 'reselect';
@ -215,21 +215,23 @@ const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({
return (
visible ? (
<RenderAfter update={update}>
<EmojiPicker
custom={withCustom ? [{ emojis: buildCustomEmojis(customEmojis) }] : undefined}
title={title}
onEmojiSelect={handlePick}
recent={frequentlyUsedEmojis}
perLine={8}
skin={handleSkinTone}
emojiSize={22}
emojiButtonSize={34}
set='twitter'
theme={theme}
i18n={getI18n()}
skinTonePosition='search'
previewPosition='none'
/>
<Suspense>
<EmojiPicker
custom={withCustom ? [{ emojis: buildCustomEmojis(customEmojis) }] : undefined}
title={title}
onEmojiSelect={handlePick}
recent={frequentlyUsedEmojis}
perLine={8}
skin={handleSkinTone}
emojiSize={22}
emojiButtonSize={34}
set='twitter'
theme={theme}
i18n={getI18n()}
skinTonePosition='search'
previewPosition='none'
/>
</Suspense>
</RenderAfter>
) : null
);