remove defocus support

sherlo-io · Nov 28, 2024 · 7225f2e · 7225f2e
1 parent fc2efc2
commit 7225f2e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 87 deletions.
diff --git a/examples/expo-cloud-builds/src/components/FocusedInput/FocusedInput.stories.tsx b/examples/expo-cloud-builds/src/components/FocusedInput/FocusedInput.stories.tsx
@@ -7,14 +7,4 @@ export default {
   decorators: [StoryDecorator({ placement: 'center' })],
 } as Meta<typeof FocusedInput>;
 
-export const Basic = {
-  parameters: {
-    sherlo: {
-      /**
-       * This will prevent the input from being focused and displaying
-       * the caret blinking which would cause differences in Sherlo screenshot tests
-       */
-      defocus: true,
-    },
-  },
-};
+export const Basic = {};
diff --git a/examples/expo-updates/src/components/FocusedInput/FocusedInput.stories.tsx b/examples/expo-updates/src/components/FocusedInput/FocusedInput.stories.tsx
@@ -7,14 +7,4 @@ export default {
   decorators: [StoryDecorator({ placement: 'center' })],
 } as Meta<typeof FocusedInput>;
 
-export const Basic = {
-  parameters: {
-    sherlo: {
-      /**
-       * This will prevent the input from being focused and displaying
-       * the caret blinking which would cause differences in Sherlo screenshot tests
-       */
-      defocus: true,
-    },
-  },
-};
+export const Basic = {};
diff --git a/examples/local-builds/src/components/FocusedInput/FocusedInput.stories.tsx b/examples/local-builds/src/components/FocusedInput/FocusedInput.stories.tsx
@@ -7,14 +7,4 @@ export default {
   decorators: [StoryDecorator({ placement: 'center' })],
 } as Meta<typeof FocusedInput>;
 
-export const Basic = {
-  parameters: {
-    sherlo: {
-      /**
-       * This will prevent the input from being focused and displaying
-       * the caret blinking which would cause differences in Sherlo screenshot tests
-       */
-      defocus: true,
-    },
-  },
-};
+export const Basic = {};
diff --git a/packages/react-native-storybook/src/getStorybook/getStorybook.tsx b/packages/react-native-storybook/src/getStorybook/getStorybook.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useRef, useState, ReactElement } from 'react';
-import { Keyboard, Platform, StyleSheet, Text, View } from 'react-native';
+import { StyleSheet, Text, View } from 'react-native';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { RunnerBridge, SherloModule } from '../helpers';
 import { Snapshot, StorybookParams, StorybookView } from '../types';
@@ -37,25 +37,6 @@ function getStorybook(view: StorybookView, params?: StorybookParams): () => Reac
       },
     });
 
-    const prepareSnapshotForTesting = async (snapshot: Snapshot): Promise<void> => {
-      RunnerBridge.log('prepareSnapshotForTesting', { viewId: snapshot.viewId });
-
-      if (snapshot.sherloParameters?.defocus) {
-        RunnerBridge.log('defocusing focused input');
-
-        await waitForKeyboardStatus('shown');
-
-        if (Platform.OS === 'ios') {
-          await waitForKeyboardStatus('hidden');
-        } else {
-          // We call Keyboard.dismiss() multiple times because for some reason it sometimes doesn't work on the first try
-          for (let i = 0; i < 7; i++) {
-            Keyboard.dismiss();
-          }
-        }
-      }
-    };
-
     // Testing mode
     useTestingMode(view, mode, setSnapshots, setTestedIndex, RunnerBridge);
 
@@ -97,8 +78,6 @@ function getStorybook(view: StorybookView, params?: StorybookParams): () => Reac
       });
 
       const testStory = async (): Promise<void> => {
-        await prepareSnapshotForTesting(renderedSnapshot);
-
         setTimeout(async () => {
           try {
             let inspectorData;

diff --git a/packages/react-native-storybook/src/types/types.ts b/packages/react-native-storybook/src/types/types.ts
@@ -1,13 +1,5 @@
 import { start } from '@storybook/react-native';
 export interface SherloParameters {
-  /**
-   * Setting defocus to true hides the keyboard and defocuses any focused input
-   * before taking the screenshot. This is useful because focused inputs have
-   * animated elements that will make screenshots unpredictable when compared
-   * to the baseline.
-   */
-  defocus?: boolean;
-
   /**
    * Setting exclude to true skips the story during testing. This might be
    * useful if the story has animations that cannot be stabilized for testing

diff --git a/testing/expo-storybook-7/src/components/FocusedInput/FocusedInput.stories.tsx b/testing/expo-storybook-7/src/components/FocusedInput/FocusedInput.stories.tsx
@@ -7,14 +7,4 @@ export default {
   decorators: [StoryDecorator({ placement: 'center' })],
 } as Meta<typeof FocusedInput>;
 
-export const Basic = {
-  parameters: {
-    sherlo: {
-      /**
-       * This will prevent the input from being focused and displaying
-       * the caret blinking which would cause differences in Sherlo screenshot tests
-       */
-      defocus: true,
-    },
-  },
-};
+export const Basic = {};
diff --git a/testing/expo-storybook-8/src/components/FocusedInput/FocusedInput.stories.tsx b/testing/expo-storybook-8/src/components/FocusedInput/FocusedInput.stories.tsx
@@ -7,16 +7,4 @@ export default {
   decorators: [StoryDecorator({ placement: 'center' })],
 } as Meta<typeof FocusedInput>;
 
-export const Basic = {
-  parameters: {
-    sherlo: {
-      /**
-       * This will prevent the input from being focused and displaying
-       * the caret blinking which would cause differences in Sherlo screenshot tests
-       */
-      defocus: true,
-    },
-  },
-};
-
-export const Focused = {};
+export const Basic = {};