react-native-onyx 1.0.66 → 1.0.68

package/dist/web.development.js

@@ -2473,14 +2473,15 @@ function getDisplayName(component) {
           return;
         }
 
-        const stateUpdate = { ...this.tempState, loading: false };
+        // Leave untouched previous state to avoid data loss during pre-load updates.
+        // This handles case when setState was called before the setWithOnyxState.
+        // For example, when an Onyx property was updated by keyChanged before the call of the setWithOnyxState.
+        this.setState((prevState) => {
+          const remainingTempState = underscore__WEBPACK_IMPORTED_MODULE_2___default().omit(this.tempState, underscore__WEBPACK_IMPORTED_MODULE_2___default().keys(prevState));
 
-        // The state is set here manually, instead of using setState because setState is an async operation, meaning it might execute on the next tick,
-        // or at a later point in the microtask queue. That can lead to a race condition where
-        // setWithOnyxState is called before the state is actually set. This results in unreliable behavior when checking the loading state and has been mainly observed on fabric.
-        this.state = stateUpdate;
+          return { ...remainingTempState, loading: false };
+        });
 
-        this.setState(stateUpdate); // Trigger a render
         delete this.tempState;
       }