Add React.unstable_getCacheForType

facebook · Dec 1, 2020 · 0102de6 · 0102de6
1 parent 1e7e5a9
commit 0102de6
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/packages/react-fetch/src/ReactFetchBrowser.js b/packages/react-fetch/src/ReactFetchBrowser.js
@@ -9,7 +9,7 @@
 
 import type {Wakeable} from 'shared/ReactTypes';
 
-import * as React from 'react';
+import {getCacheForType} from 'react';
 
 const Pending = 0;
 const Resolved = 1;
@@ -35,12 +35,8 @@ type Result = PendingResult | ResolvedResult | RejectedResult;
 // TODO: this is a browser-only version. Add a separate Node entry point.
 const nativeFetch = window.fetch;
 
-const ReactCurrentDispatcher =
- React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
- .ReactCurrentDispatcher;
-
 function getResultMap(): Map<string, Result> {
- return ReactCurrentDispatcher.current.getCacheForType(createResultMap);
+ return getCacheForType(createResultMap);
 }
 
 function createResultMap(): Map<string, Result> {

diff --git a/packages/react-fetch/src/ReactFetchNode.js b/packages/react-fetch/src/ReactFetchNode.js
@@ -11,7 +11,7 @@ import type {Wakeable} from 'shared/ReactTypes';
 
 import * as http from 'http';
 import * as https from 'https';
-import * as React from 'react';
+import {getCacheForType} from 'react';
 
 type FetchResponse = {|
  // Properties
@@ -74,12 +74,8 @@ type RejectedResult = {|
 
 type Result<V> = PendingResult | ResolvedResult<V> | RejectedResult;
 
-const ReactCurrentDispatcher =
- React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
- .ReactCurrentDispatcher;
-
 function getResultMap(): Map<string, Result<FetchResponse>> {
- return ReactCurrentDispatcher.current.getCacheForType(createResultMap);
+ return getCacheForType(createResultMap);
 }
 
 function createResultMap(): Map<string, Result<FetchResponse>> {

diff --git a/packages/react/index.classic.fb.js b/packages/react/index.classic.fb.js
@@ -42,6 +42,8 @@ export {
  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
  createFactory,
  // exposeConcurrentModeAPIs
+ getCacheForType,
+ getCacheForType as unstable_getCacheForType,
  useTransition,
  useTransition as unstable_useTransition,
  useDeferredValue,

diff --git a/packages/react/index.experimental.js b/packages/react/index.experimental.js
@@ -40,6 +40,7 @@ export {
  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
  createFactory,
  // exposeConcurrentModeAPIs
+ getCacheForType as unstable_getCacheForType,
  useTransition as unstable_useTransition,
  useDeferredValue as unstable_useDeferredValue,
  startTransition as unstable_startTransition,

diff --git a/packages/react/index.js b/packages/react/index.js
@@ -70,6 +70,8 @@ export {
  version,
  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
  createFactory,
+ getCacheForType,
+ getCacheForType as unstable_getCacheForType,
  useTransition,
  useTransition as unstable_useTransition,
  startTransition,

diff --git a/packages/react/index.modern.fb.js b/packages/react/index.modern.fb.js
@@ -41,6 +41,8 @@ export {
  version,
  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
  // exposeConcurrentModeAPIs
+ getCacheForType,
+ getCacheForType as unstable_getCacheForType,
  useTransition,
  useTransition as unstable_useTransition,
  useDeferredValue,

diff --git a/packages/react/src/React.js b/packages/react/src/React.js
@@ -33,6 +33,7 @@ import {lazy} from './ReactLazy';
 import {forwardRef} from './ReactForwardRef';
 import {memo} from './ReactMemo';
 import {
+ getCacheForType,
  useCallback,
  useContext,
  useEffect,
@@ -105,6 +106,7 @@ export {
  // Deprecated behind disableCreateFactory
  createFactory,
  // Concurrent Mode
+ getCacheForType,
  useTransition,
  startTransition,
  useDeferredValue,

diff --git a/packages/react/src/ReactHooks.js b/packages/react/src/ReactHooks.js
@@ -36,6 +36,11 @@ function resolveDispatcher() {
  return dispatcher;
 }
 
+export function getCacheForType<T>(resourceType: () => T): T {
+ const dispatcher = resolveDispatcher();
+ return dispatcher.getCacheForType(resourceType);
+}
+
 export function useContext<T>(
  Context: ReactContext<T>,
  unstable_observedBits: number | boolean | void,