react-native 0.69.0-rc.6 → 0.70.0-rc.0

package/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java

@@ -1,301 +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.
- */
-
-package com.facebook.react.tests;
-
-import android.content.Context;
-import android.widget.ScrollView;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.testing.ReactAppInstrumentationTestCase;
-import com.facebook.react.testing.ReactInstanceSpecForTest;
-import com.facebook.react.uimanager.PixelUtil;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.views.view.ReactViewGroup;
-import com.facebook.react.views.view.ReactViewManager;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-
-/**
- * Integration test for {@code removeClippedSubviews} property that verify correct scrollview
- * behavior
- */
-public class CatalystSubviewsClippingTestCase extends ReactAppInstrumentationTestCase {
-
-  private interface SubviewsClippingTestModule extends JavaScriptModule {
-    void renderClippingSample1();
-
-    void renderClippingSample2();
-
-    void renderScrollViewTest();
-
-    void renderUpdatingSample1(boolean update1, boolean update2);
-
-    void renderUpdatingSample2(boolean update);
-  }
-
-  private final List<String> mEvents = new ArrayList<>();
-
-  @Override
-  protected String getReactApplicationKeyUnderTest() {
-    return "SubviewsClippingTestApp";
-  }
-
-  @Override
-  protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
-    return super.createReactInstanceSpecForTest().addViewManager(new ClippableViewManager(mEvents));
-  }
-
-  /**
-   * In this test view are layout in a following way:
-   *
-   * <pre>
-   * +-----------------------------+
-   * |                             |
-   * |   +---------------------+   |
-   * |   | inner1              |   |
-   * |   +---------------------+   |
-   * | +-------------------------+ |
-   * | | outer (clip=true)       | |
-   * | | +---------------------+ | |
-   * | | | inner2              | | |
-   * | | +---------------------+ | |
-   * | |                         | |
-   * | +-------------------------+ |
-   * |   +---------------------+   |
-   * |   | inner3              |   |
-   * |   +---------------------+   |
-   * |                             |
-   * +-----------------------------+
-   * </pre>
-   *
-   * <p>We expect only outer and inner2 to be attached
-   */
-  public void XtestOneLevelClippingInView() throws Throwable {
-    mEvents.clear();
-    getReactContext().getJSModule(SubviewsClippingTestModule.class).renderClippingSample1();
-    waitForBridgeAndUIIdle();
-    Assert.assertArrayEquals(new String[] {"Attach_outer", "Attach_inner2"}, mEvents.toArray());
-  }
-
-  /**
-   * In this test view are layout in a following way:
-   *
-   * <pre>
-   * In this test view are layout in a following way:
-   * +-----------------------------+
-   * | outer (clip=true)           |
-   * |                             |
-   * |                             |
-   * |                             |
-   * |              +-----------------------------+
-   * |              | complexInner (clip=true)    |
-   * |              | +----------+ | +---------+  |
-   * |              | | inner1   | | | inner2  |  |
-   * |              | |          | | |         |  |
-   * |              | +----------+ | +---------+  |
-   * +--------------+--------------+              |
-   *                | +----------+   +---------+  |
-   *                | | inner3   |   | inner4  |  |
-   *                | |          |   |         |  |
-   *                | +----------+   +---------+  |
-   *                |                             |
-   *                +-----------------------------+
-   * </pre>
-   *
-   * <p>We expect outer, complexInner & inner1 to be attached
-   */
-  public void XtestTwoLevelClippingInView() throws Throwable {
-    mEvents.clear();
-    getReactContext().getJSModule(SubviewsClippingTestModule.class).renderClippingSample2();
-    waitForBridgeAndUIIdle();
-    Assert.assertArrayEquals(
-        new String[] {"Attach_outer", "Attach_complexInner", "Attach_inner1"}, mEvents.toArray());
-  }
-
-  /**
-   * This test verifies that we update clipped subviews appropriately when some of them gets
-   * re-layouted.
-   *
-   * <p>In this test scenario we render clipping view ("outer") with two subviews, one is outside
-   * and clipped and one is inside (absolutely positioned). By updating view props we first change
-   * the height of the first element so that it should intersect with clipping "outer" view. Then we
-   * update top position of the second view so that is should go off screen.
-   */
-  public void testClippingAfterLayoutInner() {
-    SubviewsClippingTestModule subviewsClippingTestModule =
-        getReactContext().getJSModule(SubviewsClippingTestModule.class);
-
-    mEvents.clear();
-    subviewsClippingTestModule.renderUpdatingSample1(false, false);
-    waitForBridgeAndUIIdle();
-    Assert.assertArrayEquals(new String[] {"Attach_outer", "Attach_inner2"}, mEvents.toArray());
-
-    mEvents.clear();
-    subviewsClippingTestModule.renderUpdatingSample1(true, false);
-    waitForBridgeAndUIIdle();
-    Assert.assertArrayEquals(new String[] {"Attach_inner1"}, mEvents.toArray());
-
-    mEvents.clear();
-    subviewsClippingTestModule.renderUpdatingSample1(true, true);
-    waitForBridgeAndUIIdle();
-    Assert.assertArrayEquals(new String[] {"Detach_inner2"}, mEvents.toArray());
-  }
-
-  /**
-   * This test verifies that we update clipping views appropriately when parent view layout changes
-   * in a way that affects clipping.
-   *
-   * <p>In this test we render clipping view ("outer") set to be 100x100dp with inner view that is
-   * absolutely positioned out of the clipping area of the parent view. Then we resize parent view
-   * so that inner view should be visible.
-   */
-  public void testClippingAfterLayoutParent() {
-    SubviewsClippingTestModule subviewsClippingTestModule =
-        getReactContext().getJSModule(SubviewsClippingTestModule.class);
-
-    mEvents.clear();
-    subviewsClippingTestModule.renderUpdatingSample2(false);
-    waitForBridgeAndUIIdle();
-    Assert.assertArrayEquals(new String[] {"Attach_outer"}, mEvents.toArray());
-
-    mEvents.clear();
-    subviewsClippingTestModule.renderUpdatingSample2(true);
-    waitForBridgeAndUIIdle();
-    Assert.assertArrayEquals(new String[] {"Attach_inner"}, mEvents.toArray());
-  }
-
-  public void testOneLevelClippingInScrollView() throws Throwable {
-    getReactContext().getJSModule(SubviewsClippingTestModule.class).renderScrollViewTest();
-    waitForBridgeAndUIIdle();
-
-    // Only 3 first views should be attached at the beginning
-    Assert.assertArrayEquals(new String[] {"Attach_0", "Attach_1", "Attach_2"}, mEvents.toArray());
-    mEvents.clear();
-
-    // We scroll down such that first view get out of the bounds, we expect the first view to be
-    // detached and 4th view to get attached
-    scrollToDpInUIThread(120);
-    Assert.assertArrayEquals(new String[] {"Detach_0", "Attach_3"}, mEvents.toArray());
-  }
-
-  public void testTwoLevelClippingInScrollView() throws Throwable {
-    getReactContext().getJSModule(SubviewsClippingTestModule.class).renderScrollViewTest();
-    waitForBridgeAndUIIdle();
-
-    final int complexViewOffset = 4 * 120 - 300;
-
-    // Step 1
-    // We scroll down such that first "complex" view is clipped & just below the bottom of the
-    // scroll view
-    scrollToDpInUIThread(complexViewOffset);
-
-    mEvents.clear();
-
-    // Step 2
-    // Scroll a little bit so that "complex" view is visible, but it's inner views are not
-    scrollToDpInUIThread(complexViewOffset + 5);
-
-    Assert.assertArrayEquals(new String[] {"Attach_C0"}, mEvents.toArray());
-    mEvents.clear();
-
-    // Step 3
-    // Scroll even more so that first subview of "complex" view is visible, view 1 will get off
-    // screen
-    scrollToDpInUIThread(complexViewOffset + 100);
-    Assert.assertArrayEquals(new String[] {"Detach_1", "Attach_C0.1"}, mEvents.toArray());
-    mEvents.clear();
-
-    // Step 4
-    // Scroll even more to reveal second subview of "complex" view
-    scrollToDpInUIThread(complexViewOffset + 150);
-    Assert.assertArrayEquals(new String[] {"Attach_C0.2"}, mEvents.toArray());
-    mEvents.clear();
-
-    // Step 5
-    // Scroll back to previous position (Step 3), second view should get detached
-    scrollToDpInUIThread(complexViewOffset + 100);
-    Assert.assertArrayEquals(new String[] {"Detach_C0.2"}, mEvents.toArray());
-    mEvents.clear();
-
-    // Step 6
-    // Scroll back to Step 2, complex view should be visible but all subviews should be detached
-    scrollToDpInUIThread(complexViewOffset + 5);
-    Assert.assertArrayEquals(new String[] {"Attach_1", "Detach_C0.1"}, mEvents.toArray());
-    mEvents.clear();
-
-    // Step 7
-    // Scroll back to Step 1, complex view should be gone
-    scrollToDpInUIThread(complexViewOffset);
-    Assert.assertArrayEquals(new String[] {"Detach_C0"}, mEvents.toArray());
-  }
-
-  private void scrollToDpInUIThread(final int yPositionInDP) throws Throwable {
-    final ScrollView mainScrollView = getViewByTestId("scroll_view");
-    runTestOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            mainScrollView.scrollTo(0, (int) PixelUtil.toPixelFromDIP(yPositionInDP));
-          }
-        });
-    waitForBridgeAndUIIdle();
-  }
-
-  private static class ClippableView extends ReactViewGroup {
-
-    private String mClippableViewID;
-    private final List<String> mEvents;
-
-    public ClippableView(Context context, List<String> events) {
-      super(context);
-      mEvents = events;
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-      super.onAttachedToWindow();
-      mEvents.add("Attach_" + mClippableViewID);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-      super.onDetachedFromWindow();
-      mEvents.add("Detach_" + mClippableViewID);
-    }
-
-    public void setClippableViewID(String clippableViewID) {
-      mClippableViewID = clippableViewID;
-    }
-  }
-
-  private static class ClippableViewManager extends ReactViewManager {
-
-    private final List<String> mEvents;
-
-    public ClippableViewManager(List<String> events) {
-      mEvents = events;
-    }
-
-    @Override
-    public String getName() {
-      return "ClippableView";
-    }
-
-    @Override
-    public ReactViewGroup createViewInstance(ThemedReactContext context) {
-      return new ClippableView(context, mEvents);
-    }
-
-    @ReactProp(name = "clippableViewID")
-    public void setClippableViewId(ReactViewGroup view, @Nullable String clippableViewId) {
-      ((ClippableView) view).setClippableViewID(clippableViewId);
-    }
-  }
-}

package/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java

@@ -1,155 +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.
- */
-
-package com.facebook.react.tests;
-
-import android.view.View;
-import com.facebook.react.testing.ReactAppInstrumentationTestCase;
-import com.facebook.react.testing.ReactInstanceSpecForTest;
-import com.facebook.react.testing.SingleTouchGestureGenerator;
-import com.facebook.react.testing.StringRecordingModule;
-
-/**
- * This test is to verify that touch events bubbles up to the right handler. We emulate couple of
- * different gestures on top of the application reflecting following layout:
- *
- * <pre>
- * +---------------------------------------------------------------------------------------+
- * |                                                                                       |
- * | +----------------------------------------------------------------------------------+  |
- * | | +-------------+                                              +----------------+  |  |
- * | | | +---+       |                                              |                |  |  |
- * | | | | A |       |                                              |                |  |  |
- * | | | +---+       |                                              |        C       |  |  |
- * | | |     {B}     |                                              |                |  |  |
- * | | |             |                      {D}                     |                |  |  |
- * | | +-------------+                                              +----------------+  |  |
- * | |                                                                                  |  |
- * | |                                                                                  |  |
- * | +----------------------------------------------------------------------------------+  |
- * |
- * | +----------------------------------------------------------------------------------+  |
- * | |                                                                                  |  |
- * | |                                                                                  |  |
- * | |                                                                                  |  |
- * | |                                      {E}                                         |  |
- * | |                                                                                  |  |
- * | |                                                                                  |  |
- * | +----------------------------------------------------------------------------------+  |
- * +---------------------------------------------------------------------------------------+
- * </pre>
- *
- * <p>Then in each test case we either tap the center of a particular view (from A to E) or we start
- * a gesture in one view and end it with another. View with names in brackets (e.g. {D}) have touch
- * handlers set whereas all other views are not declared to handler touch events.
- */
-public class CatalystTouchBubblingTestCase extends ReactAppInstrumentationTestCase {
-
-  private final StringRecordingModule mRecordingModule = new StringRecordingModule();
-
-  @Override
-  protected String getReactApplicationKeyUnderTest() {
-    return "TouchBubblingTestAppModule";
-  }
-
-  /**
-   * 1) Simulate touch event at view A, expect {B} touch handler to fire 2) Simulate touch event at
-   * view C, expect {D} touch handler to fire
-   */
-  public void testSimpleClickAtInnerElements() {
-    mRecordingModule.reset();
-    View innerButton = getViewByTestId("A");
-    assertNotNull(innerButton);
-    createGestureGenerator().startGesture(innerButton).endGesture();
-    waitForBridgeAndUIIdle();
-    assertEquals(1, mRecordingModule.getCalls().size());
-    assertEquals("inner", mRecordingModule.getCalls().get(0));
-
-    mRecordingModule.reset();
-    innerButton = getViewByTestId("C");
-    assertNotNull(innerButton);
-    createGestureGenerator().startGesture(innerButton).endGesture();
-    waitForBridgeAndUIIdle();
-    assertEquals(1, mRecordingModule.getCalls().size());
-    assertEquals("outer", mRecordingModule.getCalls().get(0));
-  }
-
-  /**
-   * 1) Start touch at view A, then drag and release on view {B} (but outside of A), expect {B}'s
-   * touch handler to fire 2) Do the same with view C and {D}
-   */
-  public void testDownOnInnerUpOnTouchableParent() {
-    View innerButton = getViewByTestId("A");
-    View touchableParent = getViewByTestId("B");
-
-    SingleTouchGestureGenerator gestureGenerator = createGestureGenerator();
-    gestureGenerator.startGesture(innerButton);
-    // wait for tapped view measurements
-    waitForBridgeAndUIIdle();
-
-    gestureGenerator.dragTo(touchableParent, 15).endGesture();
-    waitForBridgeAndUIIdle();
-    assertEquals(1, mRecordingModule.getCalls().size());
-    assertEquals("inner", mRecordingModule.getCalls().get(0));
-
-    // Do same with second inner view
-    mRecordingModule.reset();
-
-    touchableParent = getViewByTestId("D");
-    innerButton = getViewByTestId("C");
-
-    gestureGenerator = createGestureGenerator();
-    gestureGenerator.startGesture(innerButton);
-    // wait for tapped view measurements
-    waitForBridgeAndUIIdle();
-
-    gestureGenerator.dragTo(touchableParent, 15).endGesture();
-    waitForBridgeAndUIIdle();
-    assertEquals(1, mRecordingModule.getCalls().size());
-    assertEquals("outer", mRecordingModule.getCalls().get(0));
-  }
-
-  /**
-   * Start gesture at view A, then drag and release on view {E}. Expect no touch handlers to fire
-   */
-  public void testDragOutOfTouchable() {
-    View outsideView = getViewByTestId("E");
-    View innerButton = getViewByTestId("A");
-
-    SingleTouchGestureGenerator gestureGenerator = createGestureGenerator();
-    gestureGenerator.startGesture(innerButton);
-    // wait for tapped view measurements
-    waitForBridgeAndUIIdle();
-
-    gestureGenerator.dragTo(outsideView, 15).endGesture();
-    waitForBridgeAndUIIdle();
-    assertTrue(mRecordingModule.getCalls().isEmpty());
-  }
-
-  /**
-   * In this scenario we start gesture at view A (has two touchable parents {B} and {D}) then we
-   * drag and release gesture on view {D}, but outside of {B}. We expect no touch handler to fire
-   */
-  public void testNoEventWhenDragOutOfFirstTouchableParentToItsTouchableParent() {
-    View topLevelTouchable = getViewByTestId("C");
-    View innerButton = getViewByTestId("A");
-
-    SingleTouchGestureGenerator gestureGenerator = createGestureGenerator();
-    gestureGenerator.startGesture(innerButton);
-    // wait for tapped view measurements
-    waitForBridgeAndUIIdle();
-
-    gestureGenerator.dragTo(topLevelTouchable, 15).endGesture();
-    waitForBridgeAndUIIdle();
-    assertTrue(mRecordingModule.getCalls().isEmpty());
-  }
-
-  @Override
-  protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
-    return new ReactInstanceSpecForTest().addNativeModule(mRecordingModule);
-  }
-}