react-relay 14.1.0 → 15.0.0

package/lib/relay-hooks/react-cache/usePaginationFragment_REACT_CACHE.js

@@ -4,85 +4,77 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+relay
  * 
  * @format
+ * @oncall relay
  */
+
 'use strict';
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var useLoadMoreFunction = require('../useLoadMoreFunction');
-
+var useRelayEnvironment = require('../useRelayEnvironment');
 var useStaticFragmentNodeWarning = require('../useStaticFragmentNodeWarning');
-
 var useRefetchableFragmentInternal = require('./useRefetchableFragmentInternal_REACT_CACHE');
-
 var _require = require('react'),
-    useCallback = _require.useCallback,
-    useDebugValue = _require.useDebugValue,
-    useState = _require.useState;
-
+  useCallback = _require.useCallback,
+  useDebugValue = _require.useDebugValue,
+  useState = _require.useState;
 var _require2 = require('relay-runtime'),
-    getFragment = _require2.getFragment,
-    getFragmentIdentifier = _require2.getFragmentIdentifier,
-    getPaginationMetadata = _require2.getPaginationMetadata;
-
+  getFragment = _require2.getFragment,
+  getFragmentIdentifier = _require2.getFragmentIdentifier,
+  getPaginationMetadata = _require2.getPaginationMetadata;
 function usePaginationFragment(fragmentInput, parentFragmentRef) {
   var fragmentNode = getFragment(fragmentInput);
   useStaticFragmentNodeWarning(fragmentNode, 'first argument of usePaginationFragment()');
   var componentDisplayName = 'usePaginationFragment()';
-
   var _getPaginationMetadat = getPaginationMetadata(fragmentNode, componentDisplayName),
-      connectionPathInFragmentData = _getPaginationMetadat.connectionPathInFragmentData,
-      paginationRequest = _getPaginationMetadat.paginationRequest,
-      paginationMetadata = _getPaginationMetadat.paginationMetadata,
-      identifierField = _getPaginationMetadat.identifierField;
-
+    connectionPathInFragmentData = _getPaginationMetadat.connectionPathInFragmentData,
+    paginationRequest = _getPaginationMetadat.paginationRequest,
+    paginationMetadata = _getPaginationMetadat.paginationMetadata,
+    identifierField = _getPaginationMetadat.identifierField;
   var _useRefetchableFragme = useRefetchableFragmentInternal(fragmentNode, parentFragmentRef, componentDisplayName),
-      fragmentData = _useRefetchableFragme.fragmentData,
-      fragmentRef = _useRefetchableFragme.fragmentRef,
-      refetch = _useRefetchableFragme.refetch;
-
-  var fragmentIdentifier = getFragmentIdentifier(fragmentNode, fragmentRef); // Backward pagination
+    fragmentData = _useRefetchableFragme.fragmentData,
+    fragmentRef = _useRefetchableFragme.fragmentRef,
+    refetch = _useRefetchableFragme.refetch;
+  var fragmentIdentifier = getFragmentIdentifier(fragmentNode, fragmentRef);
 
+  // Backward pagination
   var _useLoadMore = useLoadMore({
-    componentDisplayName: componentDisplayName,
-    connectionPathInFragmentData: connectionPathInFragmentData,
-    direction: 'backward',
-    fragmentData: fragmentData,
-    fragmentIdentifier: fragmentIdentifier,
-    fragmentNode: fragmentNode,
-    fragmentRef: fragmentRef,
-    identifierField: identifierField,
-    paginationMetadata: paginationMetadata,
-    paginationRequest: paginationRequest
-  }),
-      loadPrevious = _useLoadMore[0],
-      hasPrevious = _useLoadMore[1],
-      isLoadingPrevious = _useLoadMore[2],
-      disposeFetchPrevious = _useLoadMore[3]; // Forward pagination
-
-
+      componentDisplayName: componentDisplayName,
+      connectionPathInFragmentData: connectionPathInFragmentData,
+      direction: 'backward',
+      fragmentData: fragmentData,
+      fragmentIdentifier: fragmentIdentifier,
+      fragmentNode: fragmentNode,
+      fragmentRef: fragmentRef,
+      identifierField: identifierField,
+      paginationMetadata: paginationMetadata,
+      paginationRequest: paginationRequest
+    }),
+    loadPrevious = _useLoadMore[0],
+    hasPrevious = _useLoadMore[1],
+    isLoadingPrevious = _useLoadMore[2],
+    disposeFetchPrevious = _useLoadMore[3];
+
+  // Forward pagination
   var _useLoadMore2 = useLoadMore({
-    componentDisplayName: componentDisplayName,
-    connectionPathInFragmentData: connectionPathInFragmentData,
-    direction: 'forward',
-    fragmentData: fragmentData,
-    fragmentIdentifier: fragmentIdentifier,
-    fragmentNode: fragmentNode,
-    fragmentRef: fragmentRef,
-    identifierField: identifierField,
-    paginationMetadata: paginationMetadata,
-    paginationRequest: paginationRequest
-  }),
-      loadNext = _useLoadMore2[0],
-      hasNext = _useLoadMore2[1],
-      isLoadingNext = _useLoadMore2[2],
-      disposeFetchNext = _useLoadMore2[3];
-
+      componentDisplayName: componentDisplayName,
+      connectionPathInFragmentData: connectionPathInFragmentData,
+      direction: 'forward',
+      fragmentData: fragmentData,
+      fragmentIdentifier: fragmentIdentifier,
+      fragmentNode: fragmentNode,
+      fragmentRef: fragmentRef,
+      identifierField: identifierField,
+      paginationMetadata: paginationMetadata,
+      paginationRequest: paginationRequest
+    }),
+    loadNext = _useLoadMore2[0],
+    hasNext = _useLoadMore2[1],
+    isLoadingNext = _useLoadMore2[2],
+    disposeFetchNext = _useLoadMore2[3];
   var refetchPagination = useCallback(function (variables, options) {
     disposeFetchNext();
     disposeFetchPrevious();
@@ -90,7 +82,6 @@ function usePaginationFragment(fragmentInput, parentFragmentRef) {
       __environment: undefined
     }));
   }, [disposeFetchNext, disposeFetchPrevious, refetch]);
-
   if (process.env.NODE_ENV !== "production") {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useDebugValue({
@@ -102,7 +93,6 @@ function usePaginationFragment(fragmentInput, parentFragmentRef) {
       isLoadingPrevious: isLoadingPrevious
     });
   }
-
   return {
     data: fragmentData,
     loadNext: loadNext,
@@ -114,12 +104,25 @@ function usePaginationFragment(fragmentInput, parentFragmentRef) {
     refetch: refetchPagination
   };
 }
-
 function useLoadMore(args) {
+  var environment = useRelayEnvironment();
   var _useState = useState(false),
-      isLoadingMore = _useState[0],
-      setIsLoadingMore = _useState[1];
-
+    isLoadingMore = _useState[0],
+    reallySetIsLoadingMore = _useState[1];
+  // Schedule this update since it must be observed by components at the same
+  // batch as when hasNext changes. hasNext is read from the store and store
+  // updates are scheduled, so this must be scheduled too.
+  var setIsLoadingMore = function setIsLoadingMore(value) {
+    var _environment$getSched;
+    var schedule = (_environment$getSched = environment.getScheduler()) === null || _environment$getSched === void 0 ? void 0 : _environment$getSched.schedule;
+    if (schedule) {
+      schedule(function () {
+        reallySetIsLoadingMore(value);
+      });
+    } else {
+      reallySetIsLoadingMore(value);
+    }
+  };
   var observer = {
     start: function start() {
       return setIsLoadingMore(true);
@@ -131,20 +134,16 @@ function useLoadMore(args) {
       return setIsLoadingMore(false);
     }
   };
-
   var handleReset = function handleReset() {
     return setIsLoadingMore(false);
   };
-
   var _useLoadMoreFunction = useLoadMoreFunction((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, args), {}, {
-    observer: observer,
-    onReset: handleReset
-  })),
-      loadMore = _useLoadMoreFunction[0],
-      hasMore = _useLoadMoreFunction[1],
-      disposeFetch = _useLoadMoreFunction[2];
-
+      observer: observer,
+      onReset: handleReset
+    })),
+    loadMore = _useLoadMoreFunction[0],
+    hasMore = _useLoadMoreFunction[1],
+    disposeFetch = _useLoadMoreFunction[2];
   return [loadMore, hasMore, isLoadingMore, disposeFetch];
 }
-
 module.exports = usePaginationFragment;

package/lib/relay-hooks/react-cache/usePreloadedQuery_REACT_CACHE.js

@@ -5,46 +5,37 @@
  * LICENSE file in the root directory of this source tree.
  *
  * 
- * @emails oncall+relay
  * @format
+ * @oncall relay
  */
+
 'use strict';
 
 var _require = require('../loadQuery'),
-    useTrackLoadQueryInRender = _require.useTrackLoadQueryInRender;
-
+  useTrackLoadQueryInRender = _require.useTrackLoadQueryInRender;
 var useMemoOperationDescriptor = require('../useMemoOperationDescriptor');
-
 var useRelayEnvironment = require('../useRelayEnvironment');
-
 var getQueryResultOrFetchQuery = require('./getQueryResultOrFetchQuery_REACT_CACHE');
-
 var useFragmentInternal = require('./useFragmentInternal_REACT_CACHE');
-
 var invariant = require('invariant');
-
 var _require2 = require('react'),
-    useDebugValue = _require2.useDebugValue,
-    useEffect = _require2.useEffect;
-
+  useDebugValue = _require2.useDebugValue,
+  useEffect = _require2.useEffect;
 var _require3 = require('relay-runtime'),
-    _require3$__internal = _require3.__internal,
-    fetchQueryDeduped = _require3$__internal.fetchQueryDeduped,
-    fetchQuery = _require3$__internal.fetchQuery;
-
+  _require3$__internal = _require3.__internal,
+  fetchQueryDeduped = _require3$__internal.fetchQueryDeduped,
+  fetchQuery = _require3$__internal.fetchQuery;
 var warning = require("fbjs/lib/warning");
-
 function usePreloadedQuery_REACT_CACHE(gqlQuery, preloadedQuery, options) {
   var environment = useRelayEnvironment();
   useTrackLoadQueryInRender();
   var fetchKey = preloadedQuery.fetchKey,
-      fetchPolicy = preloadedQuery.fetchPolicy,
-      source = preloadedQuery.source,
-      variables = preloadedQuery.variables,
-      networkCacheConfig = preloadedQuery.networkCacheConfig;
+    fetchPolicy = preloadedQuery.fetchPolicy,
+    source = preloadedQuery.source,
+    variables = preloadedQuery.variables,
+    networkCacheConfig = preloadedQuery.networkCacheConfig;
   var operation = useMemoOperationDescriptor(gqlQuery, variables, networkCacheConfig);
   var fetchObservable;
-
   if (preloadedQuery.kind === 'PreloadedQuery_DEPRECATED') {
     !(operation.request.node.params.name === preloadedQuery.name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'usePreloadedQuery(): Expected data to be prefetched for query `%s`, ' + 'got prefetch results for query `%s`.', operation.request.node.params.name, preloadedQuery.name) : invariant(false) : void 0;
     fetchObservable = fetchQueryDeduped(environment, operation.request.identifier, function () {
@@ -62,7 +53,6 @@ function usePreloadedQuery_REACT_CACHE(gqlQuery, preloadedQuery, options) {
   } else {
     process.env.NODE_ENV !== "production" ? warning(preloadedQuery.isDisposed === false, 'usePreloadedQuery(): Expected preloadedQuery to not be disposed yet. ' + 'This is because disposing the query marks it for future garbage ' + 'collection, and as such query results may no longer be present in the Relay ' + 'store. In the future, this will become a hard error.') : void 0;
     var fallbackFetchObservable = fetchQuery(environment, operation);
-
     if (source != null && environment === preloadedQuery.environment) {
       // If the source observable exists and the environments match, reuse
       // the source observable.
@@ -84,28 +74,26 @@ function usePreloadedQuery_REACT_CACHE(gqlQuery, preloadedQuery, options) {
       // fall back and re-execute and de-dupe the query (at render time).
       fetchObservable = fallbackFetchObservable;
     }
-  } // Get the query going if needed -- this may suspend.
-
+  }
 
+  // Get the query going if needed -- this may suspend.
   var _getQueryResultOrFetc = getQueryResultOrFetchQuery(environment, operation, {
-    fetchPolicy: fetchPolicy,
-    renderPolicy: options === null || options === void 0 ? void 0 : options.UNSTABLE_renderPolicy,
-    fetchKey: fetchKey,
-    fetchObservable: fetchObservable
-  }),
-      queryResult = _getQueryResultOrFetc[0],
-      effect = _getQueryResultOrFetc[1];
-
-  useEffect(effect); // Read the query's root fragment -- this may suspend.
+      fetchPolicy: fetchPolicy,
+      renderPolicy: options === null || options === void 0 ? void 0 : options.UNSTABLE_renderPolicy,
+      fetchKey: fetchKey,
+      fetchObservable: fetchObservable
+    }),
+    queryResult = _getQueryResultOrFetc[0],
+    effect = _getQueryResultOrFetc[1];
+  useEffect(effect);
 
+  // Read the query's root fragment -- this may suspend.
   var fragmentNode = queryResult.fragmentNode,
-      fragmentRef = queryResult.fragmentRef; // $FlowExpectedError[incompatible-return] Is this a fixable incompatible-return?
-
+    fragmentRef = queryResult.fragmentRef;
   var data = useFragmentInternal(fragmentNode, fragmentRef, 'usePreloadedQuery()', {
     fetchPolicy: fetchPolicy,
     networkCacheConfig: networkCacheConfig
   });
-
   if (process.env.NODE_ENV !== "production") {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useDebugValue({
@@ -117,8 +105,6 @@ function usePreloadedQuery_REACT_CACHE(gqlQuery, preloadedQuery, options) {
       renderPolicy: options === null || options === void 0 ? void 0 : options.UNSTABLE_renderPolicy
     });
   }
-
   return data;
 }
-
 module.exports = usePreloadedQuery_REACT_CACHE;