diff --git a/packages/react-relay/ReactRelayQueryRenderer.js b/packages/react-relay/ReactRelayQueryRenderer.js index edc706cd78caf..d19682a452f5a 100644 --- a/packages/react-relay/ReactRelayQueryRenderer.js +++ b/packages/react-relay/ReactRelayQueryRenderer.js @@ -171,35 +171,8 @@ class ReactRelayQueryRenderer extends React.Component { const newState = resetQueryStateForUpdate(this.props, prevState); const {requestCacheKey, queryFetcher} = newState; if (requestCacheKey != null && requestCache[requestCacheKey] != null) { - if (RelayFeatureFlags.ENABLE_QUERY_RENDERER_SET_STATE_PREVENTION) { - // $FlowFixMe[incompatible-use] - const fetchResult = queryFetcher.getFetchResult(); - if (fetchResult != null) { - const snapshot = fetchResult.snapshot ?? null; - const error = fetchResult.error ?? null; - - const {requestCacheKey: prevRequestCacheKey} = prevState; - if (prevRequestCacheKey != null) { - delete requestCache[prevRequestCacheKey]; - } - - newState.renderProps = getRenderProps( - error, - snapshot, - // $FlowFixMe[incompatible-call] - queryFetcher, - prevState.retryCallbacks, - ); - newState.snapshot = snapshot; - newState.requestCacheKey = null; - } else { - // $FlowFixMe[incompatible-use] - queryFetcher.setOnDataChange(this._handleDataChange); - } - } else { - // $FlowFixMe[incompatible-use] - queryFetcher.setOnDataChange(this._handleDataChange); - } + // $FlowFixMe[incompatible-use] + queryFetcher.setOnDataChange(this._handleDataChange); } return newState; }); diff --git a/packages/relay-runtime/util/RelayFeatureFlags.js b/packages/relay-runtime/util/RelayFeatureFlags.js index 3e4e86c7260c3..d0dc743f4b343 100644 --- a/packages/relay-runtime/util/RelayFeatureFlags.js +++ b/packages/relay-runtime/util/RelayFeatureFlags.js @@ -28,7 +28,6 @@ export type FeatureFlags = { STRING_INTERN_LEVEL: number, USE_REACT_CACHE: boolean, USE_REACT_CACHE_LEGACY_TIMEOUTS: boolean, - ENABLE_QUERY_RENDERER_SET_STATE_PREVENTION: boolean, LOG_MISSING_RECORDS_IN_PROD: boolean, ENABLE_RELAY_OPERATION_TRACKER_SUSPENSE: boolean, @@ -63,7 +62,6 @@ const RelayFeatureFlags: FeatureFlags = { STRING_INTERN_LEVEL: 0, USE_REACT_CACHE: false, USE_REACT_CACHE_LEGACY_TIMEOUTS: true, - ENABLE_QUERY_RENDERER_SET_STATE_PREVENTION: false, LOG_MISSING_RECORDS_IN_PROD: false, ENABLE_LOOSE_SUBSCRIPTION_ATTRIBUTION: false, ENABLE_OPERATION_TRACKER_OPTIMISTIC_UPDATES: false,