From 7ac58772b19c32a272f3c85af38aa43b6d511f05 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@meta.com>
Date: Wed, 6 Sep 2023 05:58:57 -0700
Subject: [PATCH] Clarify meaning of State constructor args (#39307)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/39307

Make it explicit that the second arg for the State update constructor is the old State object, which we use to increment the revision.

Changelog: [Internal]

Reviewed By: rshest

Differential Revision: D49008431

fbshipit-source-id: 649bdd136a4a6eb25858d8bfb7c41b725e593685
---
 .../ReactCommon/react/renderer/core/ConcreteState.h         | 4 ++--
 .../react-native/ReactCommon/react/renderer/core/State.cpp  | 6 +++---
 .../react-native/ReactCommon/react/renderer/core/State.h    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h
index 441c6efb911..cfc3a1a4f95 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h
@@ -32,8 +32,8 @@ class ConcreteState : public State {
   /*
    * Creates an updated `State` object with given previous one and `data`.
    */
-  explicit ConcreteState(const SharedData& data, const State& state)
-      : State(data, state) {}
+  explicit ConcreteState(const SharedData& data, const State& previousState)
+      : State(data, previousState) {}
 
   /*
    * Creates a first-of-its-family `State` object with given `family` and
diff --git a/packages/react-native/ReactCommon/react/renderer/core/State.cpp b/packages/react-native/ReactCommon/react/renderer/core/State.cpp
index 23ba6d0009a..8c20d4b7823 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/State.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/core/State.cpp
@@ -16,10 +16,10 @@
 
 namespace facebook::react {
 
-State::State(StateData::Shared data, const State& state)
-    : family_(state.family_),
+State::State(StateData::Shared data, const State& previousState)
+    : family_(previousState.family_),
       data_(std::move(data)),
-      revision_(state.revision_ + 1){};
+      revision_(previousState.revision_ + 1){};
 
 State::State(StateData::Shared data, const ShadowNodeFamily::Shared& family)
     : family_(family),
diff --git a/packages/react-native/ReactCommon/react/renderer/core/State.h b/packages/react-native/ReactCommon/react/renderer/core/State.h
index f4df0cd648d..5297cdcf8a8 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/State.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/State.h
@@ -33,7 +33,7 @@ class State {
    * Constructors are protected to make calling them directly with
    * type-erasured arguments impossible.
    */
-  explicit State(StateData::Shared data, const State& state);
+  explicit State(StateData::Shared data, const State& previousState);
   explicit State(
       StateData::Shared data,
       const ShadowNodeFamily::Shared& family);