Merge branch 'feedback-ui-2' into antonis/ios-accessibility

# Conflicts:
#	packages/core/src/js/feedback/ScreenshotButton.tsx
#	packages/core/test/feedback/ScreenshotButton.test.tsx
#	packages/core/test/feedback/__snapshots__/FeedbackWidgetManager.test.tsx.snap

Author: antonis

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

@@ -8,19 +8,23 @@ import { defaultScreenshotButtonConfiguration } from './defaults';
 import { defaultScreenshotButtonStyles } from './FeedbackWidget.styles';
 import { getTheme } from './FeedbackWidget.theme';
 import type { ScreenshotButtonProps, ScreenshotButtonStyles, ScreenshotButtonTextConfiguration } from './FeedbackWidget.types';
-import { hideScreenshotButton, showFeedbackWidget } from './FeedbackWidgetManager';
+import { hideScreenshotButton, showFeedbackWidget, showScreenshotButton } from './FeedbackWidgetManager';
 import { screenshotIcon } from './icons';
 import { lazyLoadFeedbackIntegration } from './lazy';
 
 let capturedScreenshot: Screenshot | undefined;
 
 const takeScreenshot = async (): Promise<void> => {
-  const screenshots: Screenshot[] | null = await NATIVE.captureScreenshot();
-  if (screenshots && screenshots.length > 0) {
-    hideScreenshotButton();
-    capturedScreenshot = screenshots[0];
-    showFeedbackWidget();
-  }
+  hideScreenshotButton();
+  setTimeout(async () => { // Delay capture to allow the button to hide
+    const screenshots: Screenshot[] | null = await NATIVE.captureScreenshot();
+    if (screenshots && screenshots.length > 0) {
+      capturedScreenshot = screenshots[0];
+      showFeedbackWidget();
+    } else {
+      showScreenshotButton();
+    }
+  }, 100);
 };
 
 export const getCapturedScreenshot = (): Screenshot | undefined => {

packages/core/test/feedback/ScreenshotButton.test.tsx

@@ -31,24 +31,11 @@ const mockBase64Image = 'mockBase64ImageString';
 const mockCaptureScreenshot = NATIVE.captureScreenshot as jest.Mock;
 const mockEncodeToBase64 = NATIVE.encodeToBase64 as jest.Mock;
 
-const defaultProps: ScreenshotButtonProps = {
-  triggerLabel: 'Take Screenshot',
-};
-
-export const customStyles: ScreenshotButtonStyles = {
-  triggerButton: {
-    backgroundColor: '#ffffff',
-  },
-  triggerText: {
-    color: '#ff0000',
-  },
-};
-
 describe('ScreenshotButton', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     FeedbackWidget.reset();
-    getCapturedScreenshot();
+    getCapturedScreenshot(); // cleans up stored screenshot if any
     resetFeedbackWidgetManager();
     resetFeedbackButtonManager();
     resetScreenshotButtonManager();
@@ -63,11 +50,22 @@ describe('ScreenshotButton', () => {
   });
 
   it('matches the snapshot with custom texts', () => {
+    const defaultProps: ScreenshotButtonProps = {
+      triggerLabel: 'Take Screenshot',
+    };
     const { toJSON } = render(<ScreenshotButton {...defaultProps}/>);
     expect(toJSON()).toMatchSnapshot();
   });
 
   it('matches the snapshot with custom styles', () => {
+    const customStyles: ScreenshotButtonStyles = {
+      triggerButton: {
+        backgroundColor: '#ffffff',
+      },
+      triggerText: {
+        color: '#ff0000',
+      },
+    };
     const customStyleProps = {styles: customStyles};
     const { toJSON } = render(<ScreenshotButton {...customStyleProps}/>);
     expect(toJSON()).toMatchSnapshot();
@@ -183,6 +181,11 @@ describe('ScreenshotButton', () => {
       const takeScreenshotButtonAfterCapture = queryByText('Take a screenshot');
       expect(takeScreenshotButtonAfterCapture).toBeNull();
     });
+    
+    await waitFor(() => {
+      const removeScreenshotButtonAfterCapture = queryByText('Remove screenshot');
+      expect(removeScreenshotButtonAfterCapture).toBeTruthy();
+    });
   });
 
   it('when the capture fails the capture button is still visible', async () => {