react-relay 0.0.0-main-7b0eeb0d → 0.0.0-main-a0680e86

package/ReactRelayContext.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-7b0eeb0d
+ * Relay v0.0.0-main-a0680e86
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/hooks.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-7b0eeb0d
+ * Relay v0.0.0-main-a0680e86
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-7b0eeb0d
+ * Relay v0.0.0-main-a0680e86
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/legacy.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-7b0eeb0d
+ * Relay v0.0.0-main-a0680e86
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/lib/relay-hooks/useFragmentInternal_EXPERIMENTAL.js

@@ -430,14 +430,19 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
     }
   }
   handlePotentialSnapshotErrorsForState(environment, state, loggerContext);
-  var storeSubscriptionRef = useRef(null);
+  var storeSubscriptionRef = useRef({
+    kind: 'uninitialized'
+  });
   useEffect(function () {
     var storeSubscription = storeSubscriptionRef.current;
-    if (storeSubscription != null) {
+    if (storeSubscription.kind === 'initialized') {
       if (state.environment === storeSubscription.environment && state.selector === storeSubscription.selector) {
         return;
       } else {
         storeSubscription.dispose();
+        storeSubscriptionRef.current = {
+          kind: 'uninitialized'
+        };
       }
     }
     if (state.kind === 'bailout') {
@@ -450,30 +455,38 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
         updatedState = updates[1];
       if (didMissUpdates) {
         setState(updatedState);
+        storeSubscriptionRef.current = {
+          kind: 'missed-updates'
+        };
         return;
       }
       stateForSubscription = updatedState;
     }
     var dispose = subscribeToSnapshot(state.environment, stateForSubscription, setState);
     storeSubscriptionRef.current = {
+      kind: 'initialized',
       dispose: dispose,
       selector: state.selector,
       environment: state.environment
     };
   }, [state]);
   useEffect(function () {
-    if (storeSubscriptionRef.current == null && state.kind !== 'bailout') {
+    if (storeSubscriptionRef.current.kind === 'uninitialized' && state.kind !== 'bailout') {
       var dispose = subscribeToSnapshot(state.environment, state, setState);
       storeSubscriptionRef.current = {
+        kind: 'initialized',
         dispose: dispose,
         selector: state.selector,
         environment: state.environment
       };
     }
     return function () {
-      var _storeSubscriptionRef;
-      (_storeSubscriptionRef = storeSubscriptionRef.current) === null || _storeSubscriptionRef === void 0 ? void 0 : _storeSubscriptionRef.dispose();
-      storeSubscriptionRef.current = null;
+      if (storeSubscriptionRef.current.kind === 'initialized') {
+        storeSubscriptionRef.current.dispose();
+      }
+      storeSubscriptionRef.current = {
+        kind: 'uninitialized'
+      };
     };
   }, []);
   var data;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-relay",
   "description": "A framework for building GraphQL-driven React applications.",
-  "version": "0.0.0-main-7b0eeb0d",
+  "version": "0.0.0-main-a0680e86",
   "keywords": [
     "graphql",
     "relay",
@@ -20,7 +20,7 @@
     "fbjs": "^3.0.2",
     "invariant": "^2.2.4",
     "nullthrows": "^1.1.1",
-    "relay-runtime": "0.0.0-main-7b0eeb0d"
+    "relay-runtime": "0.0.0-main-a0680e86"
   },
   "peerDependencies": {
     "react": "^16.9.0 || ^17 || ^18 || ^19"

package/relay-hooks/useFragmentInternal_EXPERIMENTAL.js.flow

@@ -608,15 +608,20 @@ hook useFragmentInternal_EXPERIMENTAL(
   //   or detaches (<Activity> going hidden), and then re-subscribes when the component
   //   re-attaches (<Activity> going visible). These cases wouldn't fire the
   //   "update" effect because the state and environment don't change.
-  const storeSubscriptionRef = useRef<{
-    dispose: () => void,
-    selector: ?ReaderSelector,
-    environment: IEnvironment,
-  } | null>(null);
+  const storeSubscriptionRef = useRef<
+    | {
+        kind: 'initialized',
+        dispose: () => void,
+        selector: ?ReaderSelector,
+        environment: IEnvironment,
+      }
+    | {kind: 'missed-updates'}
+    | {kind: 'uninitialized'},
+  >({kind: 'uninitialized'});
   // $FlowFixMe[react-rule-hook] - the condition is static
   useEffect(() => {
     const storeSubscription = storeSubscriptionRef.current;
-    if (storeSubscription != null) {
+    if (storeSubscription.kind === 'initialized') {
       if (
         state.environment === storeSubscription.environment &&
         state.selector === storeSubscription.selector
@@ -626,6 +631,7 @@ hook useFragmentInternal_EXPERIMENTAL(
       } else {
         // The selector has changed, so we need to dispose of the previous subscription
         storeSubscription.dispose();
+        storeSubscriptionRef.current = {kind: 'uninitialized'};
       }
     }
     if (state.kind === 'bailout') {
@@ -650,7 +656,11 @@ hook useFragmentInternal_EXPERIMENTAL(
       // to using the latest snapshot to subscribe.
       if (didMissUpdates) {
         setState(updatedState);
+        storeSubscriptionRef.current = {kind: 'missed-updates'};
         // We missed updates, we're going to render again anyway so wait until then to subscribe
+        // Setting the ref to kind: missed-updates ensures the second useEffect (simulating the
+        // setup/teardown part of the crud effect) will not set up the subscription w the stale
+        // state
         return;
       }
       stateForSubscription = updatedState;
@@ -661,6 +671,7 @@ hook useFragmentInternal_EXPERIMENTAL(
       setState,
     );
     storeSubscriptionRef.current = {
+      kind: 'initialized',
       dispose,
       selector: state.selector,
       environment: state.environment,
@@ -668,17 +679,23 @@ hook useFragmentInternal_EXPERIMENTAL(
   }, [state]);
   // $FlowFixMe[react-rule-hook] - the condition is static
   useEffect(() => {
-    if (storeSubscriptionRef.current == null && state.kind !== 'bailout') {
+    if (
+      storeSubscriptionRef.current.kind === 'uninitialized' &&
+      state.kind !== 'bailout'
+    ) {
       const dispose = subscribeToSnapshot(state.environment, state, setState);
       storeSubscriptionRef.current = {
+        kind: 'initialized',
         dispose,
         selector: state.selector,
         environment: state.environment,
       };
     }
     return () => {
-      storeSubscriptionRef.current?.dispose();
-      storeSubscriptionRef.current = null;
+      if (storeSubscriptionRef.current.kind === 'initialized') {
+        storeSubscriptionRef.current.dispose();
+      }
+      storeSubscriptionRef.current = {kind: 'uninitialized'};
     };
     // NOTE: this intentionally has no dependencies, see above comment about
     // simulating a CRUD effect