Merge aae3a98 into f220540

Author: antonis

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

@@ -157,9 +157,17 @@ export class FeedbackWidget extends React.Component<FeedbackWidgetProps, Feedbac
       } else {
         // Defaulting to the onAddScreenshot callback
         const { onAddScreenshot } = { ...defaultConfiguration, ...this.props };
-        onAddScreenshot((filename: string, attachement: Uint8Array) => {
-          // TODO: Add support for image uri when using onAddScreenshot
-          this.setState({ filename, attachment: attachement, attachmentUri: undefined });
+        onAddScreenshot((uri: string) => {
+          NATIVE.getDataFromUri(uri).then((data) => {
+            if (data != null) {
+              this.setState({ filename: 'feedback_screenshot', attachment: data, attachmentUri: uri });
+            } else {
+              logger.error('Failed to read image data from uri:', uri);
+            }
+          })
+          .catch((error) => {
+            logger.error('Failed to read image data from uri:', uri, 'error: ', error);
+          });
         });
       }
     } else {

packages/core/src/js/feedback/FeedbackWidget.types.ts

@@ -171,7 +171,7 @@ export interface FeedbackCallbacks {
   /**
    * Callback when a screenshot is added
    */
-  onAddScreenshot?: (attachFile: (filename: string, data: Uint8Array) => void) => void;
+  onAddScreenshot?: (screenshotAdded: (uri: string) => void) => void;
 
   /**
    * Callback when feedback is successfully submitted

packages/core/src/js/feedback/defaults.ts

@@ -33,7 +33,7 @@ export const defaultConfiguration: Partial<FeedbackWidgetProps> = {
       );
     }
   },
-  onAddScreenshot: (_: (filename: string, data: Uint8Array) => void) => {
+  onAddScreenshot: (_: (uri: string) => void) => {
     if (__DEV__) {
       Alert.alert('Development note', 'onAddScreenshot callback is not implemented.');
     }