chore(feedback): Improve widget animations

Author: krystofwoldrich

packages/core/src/js/feedback/FeedbackWidget.tsx

@@ -88,7 +88,9 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
     };
 
     try {
-      this.setState({ isVisible: false });
+      if (!onFormSubmitted) {
+        this.setState({ isVisible: false });
+      }
       captureFeedback(userFeedback, attachments ? { attachments } : undefined);
       onSubmitSuccess({ name: trimmedName, email: trimmedEmail, message: trimmedDescription, attachments: undefined });
       Alert.alert(text.successMessageText);
@@ -161,8 +163,11 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
     const text: FeedbackTextConfiguration = this.props;
     const styles: FeedbackWidgetStyles = { ...defaultStyles, ...this.props.styles };
     const onCancel = (): void => {
-      onFormClose();
-      this.setState({ isVisible: false });
+      if (onFormClose) {
+        onFormClose();
+      } else {
+        this.setState({ isVisible: false });
+      }
     }
 
     if (!this.state.isVisible) {

packages/core/src/js/feedback/FeedbackWidgetManager.tsx

@@ -1,6 +1,6 @@
 import { logger } from '@sentry/core';
 import * as React from 'react';
-import { Animated, KeyboardAvoidingView, Modal, PanResponder, Platform } from 'react-native';
+import { Animated, Dimensions, KeyboardAvoidingView, Modal, PanResponder, Platform } from 'react-native';
 
 import { FeedbackWidget } from './FeedbackWidget';
 import { modalBackground, modalSheetContainer, modalWrapper } from './FeedbackWidget.styles';
@@ -10,6 +10,8 @@ import { isModalSupported } from './utils';
 
 const PULL_DOWN_CLOSE_THREESHOLD = 200;
 const PULL_DOWN_ANDROID_ACTIVATION_HEIGHT = 150;
+const SLIDE_ANIMATION_DURATION = 150;
+const BACKGROUND_ANIMATION_DURATION = 200;
 
 class FeedbackWidgetManager {
   private static _isVisible = false;
@@ -53,7 +55,7 @@ class FeedbackWidgetProvider extends React.Component<FeedbackWidgetProviderProps
   public state: FeedbackWidgetProviderState = {
     isVisible: false,
     backgroundOpacity: new Animated.Value(0),
-    panY: new Animated.Value(0),
+    panY: new Animated.Value(Dimensions.get('screen').height),
   };
 
   private _panResponder = PanResponder.create({
@@ -72,8 +74,8 @@ class FeedbackWidgetProvider extends React.Component<FeedbackWidgetProviderProps
     onPanResponderRelease: (_, gestureState) => {
       if (gestureState.dy > PULL_DOWN_CLOSE_THREESHOLD) { // Close on swipe below a certain threshold
         Animated.timing(this.state.panY, {
-          toValue: 600,
-          duration: 200,
+          toValue: Dimensions.get('screen').height,
+          duration: SLIDE_ANIMATION_DURATION,
           useNativeDriver: true,
         }).start(() => {
           this._handleClose();
@@ -97,11 +99,20 @@ class FeedbackWidgetProvider extends React.Component<FeedbackWidgetProviderProps
    */
   public componentDidUpdate(_prevProps: any, prevState: FeedbackWidgetProviderState): void {
     if (!prevState.isVisible && this.state.isVisible) {
-      Animated.timing(this.state.backgroundOpacity, {
-        toValue: 1,
-        duration: 300,
-        useNativeDriver: true,
-      }).start();
+      Animated.parallel([
+        Animated.timing(this.state.backgroundOpacity, {
+          toValue: 1,
+          duration: BACKGROUND_ANIMATION_DURATION,
+          useNativeDriver: true,
+        }),
+        Animated.timing(this.state.panY, {
+          toValue: 0,
+          duration: SLIDE_ANIMATION_DURATION,
+          useNativeDriver: true,
+        })
+      ]).start(() => {
+        logger.info('FeedbackWidgetProvider componentDidUpdate');
+      });
     } else if (prevState.isVisible && !this.state.isVisible) {
       this.state.backgroundOpacity.setValue(0);
     }
@@ -130,7 +141,7 @@ class FeedbackWidgetProvider extends React.Component<FeedbackWidgetProviderProps
         {this.props.children}
         {isVisible && (
           <Animated.View style={[modalWrapper, { backgroundColor }]} >
-            <Modal visible={isVisible} transparent animationType="slide" onRequestClose={this._handleClose} testID="feedback-form-modal">
+            <Modal visible={isVisible} transparent animationType="none" onRequestClose={this._handleClose} testID="feedback-form-modal">
               <KeyboardAvoidingView
                 behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
                 style={modalBackground}
@@ -153,15 +164,28 @@ class FeedbackWidgetProvider extends React.Component<FeedbackWidgetProviderProps
   }
 
   private _setVisibilityFunction = (visible: boolean): void => {
-    this.setState({ isVisible: visible });
-    if (visible) {
-      this.state.panY.setValue(0);
-    }
+    const updateState = () => {
+      this.setState({ isVisible: visible });
+    };
+
+    Animated.parallel([
+      Animated.timing(this.state.panY, {
+        toValue: Dimensions.get('screen').height,
+        duration: SLIDE_ANIMATION_DURATION,
+        useNativeDriver: true,
+      }),
+      Animated.timing(this.state.backgroundOpacity, {
+        toValue: 0,
+        duration: BACKGROUND_ANIMATION_DURATION,
+        useNativeDriver: true,
+      })
+    ]).start(() => {
+      updateState();
+    });
   };
 
   private _handleClose = (): void => {
     FeedbackWidgetManager.hide();
-    this.setState({ isVisible: false });
   };
 }