Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix build from merge conflict #11355

Merged
merged 2 commits into from
Mar 10, 2023
Merged

Fix build from merge conflict #11355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd86d1c
Fix build from merge conflict
acoates-ms Mar 10, 2023
9d24cbb
Change files
acoates-ms Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-c68eabbe-3264-4571-b4cf-eca9997af765.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion vnext/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<float>(x), static_cast<float>(y), 0.0f}, animate);
m_scrollVisual.TryUpdatePosition({static_cast<float>(x), static_cast<float>(y), 0.0f}, animate);
} else if (commandName == "flashScrollIndicators") {
// No-op for now
} else if (commandName == "scrollToEnd") {
Expand Down