Merge pull request #19680 from esh-g/revert-animations

Reverting EmojiPicker Animation (cherry picked from commit e60f495)
Expensify · May 29, 2023 · 58c4407 · 58c4407
1 parent 70b64ce
commit 58c4407
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/components/EmojiPicker/EmojiPicker.js b/src/components/EmojiPicker/EmojiPicker.js
@@ -141,6 +141,8 @@ class EmojiPicker extends React.Component {
     }
 
     render() {
+        // There is no way to disable animations and they are really laggy, because there are so many
+        // emojis. The best alternative is to set it to 1ms so it just "pops" in and out
         return (
             <PopoverWithMeasuredContent
                 isVisible={this.state.isEmojiPickerVisible}
@@ -149,6 +151,8 @@ class EmojiPicker extends React.Component {
                 onModalHide={this.onModalHide}
                 hideModalContentWhileAnimating
                 shouldSetModalVisibility={false}
+                animationInTiming={1}
+                animationOutTiming={1}
                 anchorPosition={{
                     vertical: this.state.emojiPopoverAnchorPosition.vertical,
                     horizontal: this.state.emojiPopoverAnchorPosition.horizontal,

diff --git a/src/components/Modal/index.ios.js b/src/components/Modal/index.ios.js
@@ -7,8 +7,6 @@ const Modal = (props) => (
     <BaseModal
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
-        useNativeDriver
-        hideModalContentWhileAnimating
     >
         {props.children}
     </BaseModal>

diff --git a/src/pages/home/report/ReactionList/PopoverReactionList.js b/src/pages/home/report/ReactionList/PopoverReactionList.js
@@ -247,6 +247,7 @@ class PopoverReactionList extends React.Component {
                     anchorPosition={this.state.popoverAnchorPosition}
                     animationIn="fadeIn"
                     disableAnimation={false}
+                    animationOutTiming={1}
                     shouldSetModalVisibility={false}
                     fullscreen
                 >