Remove unstable_next from useLoadMoreFunction

Reviewed By: jstejada Differential Revision: D24954056 fbshipit-source-id: 6c2d92e3f47c57d3fc5b4bd44214805abea0ca65
facebook · Nov 16, 2020 · 3242c58 · 3242c58
1 parent 95606c5
commit 3242c58
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 42 deletions.
diff --git a/packages/relay-experimental/__tests__/useBlockingPaginationFragment-test.js b/packages/relay-experimental/__tests__/useBlockingPaginationFragment-test.js
@@ -685,22 +685,10 @@ describe('useBlockingPaginationFragment', () => {
   });
 
   describe('pagination', () => {
-    let runScheduledCallback = () => {};
     let release;
 
     beforeEach(() => {
       jest.resetModules();
-      jest.doMock('scheduler', () => {
-        const original = jest.requireActual('scheduler/unstable_mock');
-        return {
-          ...original,
-          unstable_next: cb => {
-            runScheduledCallback = () => {
-              original.unstable_next(cb);
-            };
-          },
-        };
-      });
 
       release = jest.fn();
       environment.retain.mockImplementation((...args) => {
@@ -710,10 +698,6 @@ describe('useBlockingPaginationFragment', () => {
       });
     });
 
-    afterEach(() => {
-      jest.dontMock('scheduler');
-    });
-
     function expectRequestIsInFlight(expected) {
       expect(environment.execute).toBeCalledTimes(expected.requestCount);
       expect(
@@ -838,11 +822,14 @@ describe('useBlockingPaginationFragment', () => {
           gqlPaginationQuery,
         });
 
+        expect(callback).toBeCalledTimes(0);
+
         TestRenderer.act(() => {
           loadNext(1, {onComplete: callback});
         });
+
         expect(environment.execute).toBeCalledTimes(1);
-        expect(callback).toBeCalledTimes(0);
+        expect(callback).toBeCalledTimes(1);
         expect(renderSpy).toBeCalledTimes(0);
       });
 
@@ -870,7 +857,7 @@ describe('useBlockingPaginationFragment', () => {
           loadNext(1, {onComplete: callback});
         });
         expect(environment.execute).toBeCalledTimes(0);
-        expect(callback).toBeCalledTimes(0);
+        expect(callback).toBeCalledTimes(1);
         expect(renderSpy).toBeCalledTimes(0);
       });
 

diff --git a/packages/relay-experimental/__tests__/usePaginationFragment-test.js b/packages/relay-experimental/__tests__/usePaginationFragment-test.js
@@ -740,22 +740,10 @@ describe('usePaginationFragment', () => {
   });
 
   describe('pagination', () => {
-    let runScheduledCallback = () => {};
     let release;
 
     beforeEach(() => {
       jest.resetModules();
-      jest.doMock('scheduler', () => {
-        const original = jest.requireActual('scheduler/unstable_mock');
-        return {
-          ...original,
-          unstable_next: cb => {
-            runScheduledCallback = () => {
-              original.unstable_next(cb);
-            };
-          },
-        };
-      });
 
       release = jest.fn();
       environment.retain.mockImplementation((...args) => {
@@ -765,10 +753,6 @@ describe('usePaginationFragment', () => {
       });
     });
 
-    afterEach(() => {
-      jest.dontMock('scheduler');
-    });
-
     function expectRequestIsInFlight(expected) {
       expect(environment.execute).toBeCalledTimes(expected.requestCount);
       expect(
@@ -890,6 +874,8 @@ describe('usePaginationFragment', () => {
         TestRenderer.act(() => {
           loadNext(1, {onComplete: callback});
         });
+        expect(callback).toBeCalledTimes(0);
+
         const paginationVariables = {
           id: '1',
           after: 'cursor:1',
@@ -912,7 +898,7 @@ describe('usePaginationFragment', () => {
           loadNext(1, {onComplete: callback});
         });
         expect(environment.execute).toBeCalledTimes(1);
-        expect(callback).toBeCalledTimes(0);
+        expect(callback).toBeCalledTimes(1);
         expect(renderSpy).toBeCalledTimes(0);
       });
 
@@ -943,7 +929,7 @@ describe('usePaginationFragment', () => {
           loadNext(1, {onComplete: callback});
         });
         expect(environment.execute).toBeCalledTimes(0);
-        expect(callback).toBeCalledTimes(0);
+        expect(callback).toBeCalledTimes(1);
         expect(renderSpy).toBeCalledTimes(0);
       });
 

diff --git a/packages/relay-experimental/useLoadMoreFunction.js b/packages/relay-experimental/useLoadMoreFunction.js
@@ -13,9 +13,6 @@
 
 'use strict';
 
-// flowlint-next-line untyped-import:off
-const Scheduler = require('scheduler');
-
 const getPaginationVariables = require('./getPaginationVariables');
 const getValueAtPath = require('./getValueAtPath');
 const invariant = require('invariant');
@@ -175,9 +172,7 @@ function useLoadMoreFunction<TQuery: OperationType>(
         }
 
         if (onComplete) {
-          // We make sure to always call onComplete asynchronously to prevent
-          // accidental loops in product code.
-          Scheduler.unstable_next(() => onComplete(null));
+          onComplete(null);
         }
         return {dispose: () => {}};
       }