Show recent emoji in the customize reaction emoji picker
This commit is contained in:
parent
5fb78e1986
commit
0e0982147c
3 changed files with 8 additions and 0 deletions
|
@ -29,6 +29,7 @@ const defaultProps: ComponentProps<
|
||||||
isSaving: false,
|
isSaving: false,
|
||||||
onSetSkinTone: action('onSetSkinTone'),
|
onSetSkinTone: action('onSetSkinTone'),
|
||||||
originalPreferredReactions: ['❤️', '👍', '👎', '😂', '😮', '😢'],
|
originalPreferredReactions: ['❤️', '👍', '👎', '😂', '😮', '😢'],
|
||||||
|
recentEmojis: ['cake'],
|
||||||
replaceSelectedDraftEmoji: action('replaceSelectedDraftEmoji'),
|
replaceSelectedDraftEmoji: action('replaceSelectedDraftEmoji'),
|
||||||
resetDraftEmoji: action('resetDraftEmoji'),
|
resetDraftEmoji: action('resetDraftEmoji'),
|
||||||
savePreferredReactions: action('savePreferredReactions'),
|
savePreferredReactions: action('savePreferredReactions'),
|
||||||
|
|
|
@ -23,6 +23,7 @@ type PropsType = {
|
||||||
i18n: LocalizerType;
|
i18n: LocalizerType;
|
||||||
isSaving: boolean;
|
isSaving: boolean;
|
||||||
originalPreferredReactions: Array<string>;
|
originalPreferredReactions: Array<string>;
|
||||||
|
recentEmojis: Array<string>;
|
||||||
selectedDraftEmojiIndex: undefined | number;
|
selectedDraftEmojiIndex: undefined | number;
|
||||||
skinTone: number;
|
skinTone: number;
|
||||||
|
|
||||||
|
@ -44,6 +45,7 @@ export function CustomizingPreferredReactionsModal({
|
||||||
isSaving,
|
isSaving,
|
||||||
onSetSkinTone,
|
onSetSkinTone,
|
||||||
originalPreferredReactions,
|
originalPreferredReactions,
|
||||||
|
recentEmojis,
|
||||||
replaceSelectedDraftEmoji,
|
replaceSelectedDraftEmoji,
|
||||||
resetDraftEmoji,
|
resetDraftEmoji,
|
||||||
savePreferredReactions,
|
savePreferredReactions,
|
||||||
|
@ -162,6 +164,7 @@ export function CustomizingPreferredReactionsModal({
|
||||||
);
|
);
|
||||||
replaceSelectedDraftEmoji(emoji);
|
replaceSelectedDraftEmoji(emoji);
|
||||||
}}
|
}}
|
||||||
|
recentEmojis={recentEmojis}
|
||||||
skinTone={skinTone}
|
skinTone={skinTone}
|
||||||
onSetSkinTone={onSetSkinTone}
|
onSetSkinTone={onSetSkinTone}
|
||||||
onClose={() => {
|
onClose={() => {
|
||||||
|
|
|
@ -10,6 +10,7 @@ import { useActions as usePreferredReactionsActions } from '../ducks/preferredRe
|
||||||
import { useActions as useItemsActions } from '../ducks/items';
|
import { useActions as useItemsActions } from '../ducks/items';
|
||||||
import { getIntl } from '../selectors/user';
|
import { getIntl } from '../selectors/user';
|
||||||
import { getEmojiSkinTone } from '../selectors/items';
|
import { getEmojiSkinTone } from '../selectors/items';
|
||||||
|
import { useRecentEmojis } from '../selectors/emojis';
|
||||||
import { getCustomizeModalState } from '../selectors/preferredReactions';
|
import { getCustomizeModalState } from '../selectors/preferredReactions';
|
||||||
|
|
||||||
import { CustomizingPreferredReactionsModal } from '../../components/CustomizingPreferredReactionsModal';
|
import { CustomizingPreferredReactionsModal } from '../../components/CustomizingPreferredReactionsModal';
|
||||||
|
@ -30,6 +31,8 @@ export function SmartCustomizingPreferredReactionsModal(): JSX.Element {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const recentEmojis = useRecentEmojis();
|
||||||
|
|
||||||
const skinTone = useSelector<StateType, number>(state =>
|
const skinTone = useSelector<StateType, number>(state =>
|
||||||
getEmojiSkinTone(state)
|
getEmojiSkinTone(state)
|
||||||
);
|
);
|
||||||
|
@ -38,6 +41,7 @@ export function SmartCustomizingPreferredReactionsModal(): JSX.Element {
|
||||||
<CustomizingPreferredReactionsModal
|
<CustomizingPreferredReactionsModal
|
||||||
i18n={i18n}
|
i18n={i18n}
|
||||||
onSetSkinTone={onSetSkinTone}
|
onSetSkinTone={onSetSkinTone}
|
||||||
|
recentEmojis={recentEmojis}
|
||||||
skinTone={skinTone}
|
skinTone={skinTone}
|
||||||
{...preferredReactionsActions}
|
{...preferredReactionsActions}
|
||||||
{...customizeModalState}
|
{...customizeModalState}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue