From 2ba2e82780b4809938b978553ea55406e927474b Mon Sep 17 00:00:00 2001 From: Ashutosh Khanduala Date: Sat, 7 Oct 2023 14:38:23 +0530 Subject: [PATCH] progress #8:updatePreferredSkinTone() + JsDoc upd in User.js Signed-off-by: Ashutosh Khanduala --- .../EmojiPickerMenu/EmojiPickerMenu copy.tsx | 11 +++++------ src/libs/actions/User.js | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/EmojiPicker/EmojiPickerMenu/EmojiPickerMenu copy.tsx b/src/components/EmojiPicker/EmojiPickerMenu/EmojiPickerMenu copy.tsx index afbdec31f42d..8a628e6e682d 100755 --- a/src/components/EmojiPicker/EmojiPickerMenu/EmojiPickerMenu copy.tsx +++ b/src/components/EmojiPicker/EmojiPickerMenu/EmojiPickerMenu copy.tsx @@ -33,8 +33,7 @@ const propTypes = { forwardedRef: PropTypes.func, /** Stores user's preferred skin tone */ - preferredSkinTone: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), - + preferredSkinTone: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), // TODO: preferredSkinTone must be number (always) /** Stores user's frequently used emojis */ // eslint-disable-next-line react/forbid-prop-types frequentlyUsedEmojis: PropTypes.arrayOf(PropTypes.object), @@ -64,7 +63,6 @@ const EmojiPickerMenu = (props) => { // prevent auto focus when open picker for mobile device const shouldFocusInputOnScreenFocus = canFocusInputOnScreenFocus(); - this.updatePreferredSkinTone = this.updatePreferredSkinTone.bind(this); this.setFirstNonHeaderIndex = this.setFirstNonHeaderIndex.bind(this); this.getItemLayout = this.getItemLayout.bind(this); this.scrollToHeader = this.scrollToHeader.bind(this); @@ -409,11 +407,12 @@ const EmojiPickerMenu = (props) => { /** * @param {Number} skinTone */ - function updatePreferredSkinTone(skinTone) { - if (preferredSkinTone === skinTone) { + function updatePreferredSkinTone(skinTone: number) { + if (Number(preferredSkinTone) === skinTone) { // TODO: temp Number() for safety return; } + // TODO: Change JS Doc in User.js (type string => number) User.updatePreferredSkinTone(skinTone); } @@ -537,7 +536,7 @@ const EmojiPickerMenu = (props) => { ListEmptyComponent={{translate('common.noResultsFound')}} /> diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js index 1830d1e51f6f..f939e64d0b9a 100644 --- a/src/libs/actions/User.js +++ b/src/libs/actions/User.js @@ -541,7 +541,7 @@ function subscribeToUserEvents() { /** * Sync preferredSkinTone with Onyx and Server - * @param {String} skinTone + * @param {Number} skinTone */ function updatePreferredSkinTone(skinTone) { const optimisticData = [