From cd86d1cf0f388876cd373e03971579a3049ef3c7 Mon Sep 17 00:00:00 2001 From: Andrew <30809111+acoates-ms@users.noreply.github.com> Date: Fri, 10 Mar 2023 08:43:27 -0800 Subject: [PATCH 1/2] Fix build from merge conflict --- .../Fabric/Composition/ScrollViewComponentView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp index b90023f0355..9c5d51e04ef 100644 --- a/vnext/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp +++ b/vnext/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp @@ -293,7 +293,7 @@ void ScrollViewComponentView::handleCommand(std::string const &commandName, foll auto x = arg[0].asDouble(); auto y = arg[1].asDouble(); auto animate = arg[2].asBool(); - m_visual.TryUpdatePosition({static_cast(x), static_cast(y), 0.0f}, animate); + m_scrollVisual.TryUpdatePosition({static_cast(x), static_cast(y), 0.0f}, animate); } else if (commandName == "flashScrollIndicators") { // No-op for now } else if (commandName == "scrollToEnd") { From 9d24cbbab04152499a2fda960fa6dc941d0dd944 Mon Sep 17 00:00:00 2001 From: Andrew <30809111+acoates-ms@users.noreply.github.com> Date: Fri, 10 Mar 2023 08:43:34 -0800 Subject: [PATCH 2/2] Change files --- ...ative-windows-c68eabbe-3264-4571-b4cf-eca9997af765.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/react-native-windows-c68eabbe-3264-4571-b4cf-eca9997af765.json diff --git a/change/react-native-windows-c68eabbe-3264-4571-b4cf-eca9997af765.json b/change/react-native-windows-c68eabbe-3264-4571-b4cf-eca9997af765.json new file mode 100644 index 00000000000..cc88ec632cf --- /dev/null +++ b/change/react-native-windows-c68eabbe-3264-4571-b4cf-eca9997af765.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Fix build from merge conflict", + "packageName": "react-native-windows", + "email": "30809111+acoates-ms@users.noreply.github.com", + "dependentChangeType": "patch" +}