From 92eb8691987238da67a9d3b61d15ac7e1448e303 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Sun, 24 Oct 2021 23:15:27 -0400
Subject: [PATCH] Revert "Update Modal's mock to not render its children when
 it is not visible (#32346)"

This reverts commit ec614c16b331bf3f793fda5780fa273d181a8492.
---
 Libraries/Modal/__tests__/Modal-test.js       |  9 ------
 .../__snapshots__/Modal-test.js.snap          |  2 +-
 jest/mockModal.js                             | 31 -------------------
 jest/setup.js                                 |  8 ++---
 4 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 jest/mockModal.js

diff --git a/Libraries/Modal/__tests__/Modal-test.js b/Libraries/Modal/__tests__/Modal-test.js
index 7496be95c862b0..23ebe433c5302b 100644
--- a/Libraries/Modal/__tests__/Modal-test.js
+++ b/Libraries/Modal/__tests__/Modal-test.js
@@ -27,15 +27,6 @@ describe('<Modal />', () => {
     expect(instance).toMatchSnapshot();
   });
 
-  it('should not render its children when mocked with visible=false', () => {
-    const instance = render.create(
-      <Modal visible={false}>
-        <View testID="child" />
-      </Modal>,
-    );
-    expect(instance.root.findAllByProps({testID: 'child'})).toHaveLength(0);
-  });
-
   it('should shallow render as <Modal> when mocked', () => {
     const output = render.shallow(
       <Modal>
diff --git a/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap b/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap
index 2bd414e07c8c0a..b8afa443934ab0 100644
--- a/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap
+++ b/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap
@@ -13,7 +13,7 @@ exports[`<Modal /> should render as <RCTModalHostView> when not mocked 1`] = `
 <RCTModalHostView
   animationType="none"
   hardwareAccelerated={false}
-  identifier={4}
+  identifier={1}
   onDismiss={[Function]}
   onStartShouldSetResponder={[Function]}
   presentationStyle="fullScreen"
diff --git a/jest/mockModal.js b/jest/mockModal.js
deleted file mode 100644
index 4f604454513f4a..00000000000000
--- a/jest/mockModal.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-/* eslint-env jest */
-
-'use strict';
-
-const React = require('react');
-const Modal = require('../Libraries/Modal/Modal');
-
-function mockModal(BaseComponent: $FlowFixMe) {
-  class ModalMock extends BaseComponent {
-    render(): React.Element<typeof Modal> {
-      return (
-        <BaseComponent {...this.props}>
-          {this.props.visible !== true ? null : this.props.children}
-        </BaseComponent>
-      );
-    }
-  }
-  return ModalMock;
-}
-
-module.exports = (mockModal: $FlowFixMe);
diff --git a/jest/setup.js b/jest/setup.js
index 5bc65447594091..4ed7e10c703960 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -110,11 +110,9 @@ jest
       getNativeRef: jest.fn(),
     }),
   )
-  .mock('../Libraries/Modal/Modal', () => {
-    const baseComponent = mockComponent('../Libraries/Modal/Modal');
-    const mockModal = jest.requireActual('./mockModal');
-    return mockModal(baseComponent);
-  })
+  .mock('../Libraries/Modal/Modal', () =>
+    mockComponent('../Libraries/Modal/Modal'),
+  )
   .mock('../Libraries/Components/View/View', () =>
     mockComponent('../Libraries/Components/View/View', MockNativeMethods),
   )