Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

ScrollView.scrollEnabled property #2488

Merged
merged 10 commits into from
Jun 4, 2019
Merged

ScrollView.scrollEnabled property #2488

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b72860e
Fix Horizontal ScrollView.
StephenLPeters Apr 18, 2019
37fb91f
Implement the following properties:
StephenLPeters May 9, 2019
bd9a04e
Add the following scrollView properties: snapToInterval, snapToOffset…
StephenLPeters May 9, 2019
d29be9c
Merge branch 'master' of https://github.com/microsoft/react-native-wi…
StephenLPeters May 10, 2019
5ac6c5a
Fix build errors due to narrowing cast, fix bug where updates to star…
StephenLPeters May 13, 2019
1e8d95a
Move a lot of the SV specific logic to its shadow node.
StephenLPeters May 14, 2019
07d062a
remove using winrt from uwp react instance, const many locals.
StephenLPeters May 14, 2019
10933d0
move the remainder of the locals from the viewmanager to the shadow node
StephenLPeters May 15, 2019
29e76bd
Add the scrollEnabled property
StephenLPeters May 16, 2019
a040e9e
Merge branch 'master' into ScrollView.ScrollEnabled
StephenLPeters May 16, 2019
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
30 changes: 26 additions & 4 deletions vnext/ReactUWP/Views/ScrollViewManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@ class ScrollViewShadowNode : public ShadowNodeBase
const char* eventName,
double x, double y, double zoom);
template <typename T> std::tuple<bool, T> getPropertyAndValidity(folly::dynamic propertyValue, T defaultValue);
void SetScrollMode(const winrt::ScrollViewer& scrollViewer);

float m_zoomFactor{ 1.0f };
bool m_isScrollingFromInertia = false;
bool m_isScrolling = false;

bool m_isHorizontal = false;
bool m_isScrollingEnabled = true;

winrt::FrameworkElement::SizeChanged_revoker m_scrollViewerSizeChangedRevoker{};
winrt::FrameworkElement::SizeChanged_revoker m_contentSizeChangedRevoker{};
winrt::ScrollViewer::ViewChanged_revoker m_scrollViewerViewChangedRevoker{};
Expand Down Expand Up @@ -129,9 +132,18 @@ void ScrollViewShadowNode::updateProperties(const folly::dynamic&& reactDiffMap)
const auto [valid, horizontal] = getPropertyAndValidity(propertyValue, false);
if (valid)
{
scrollViewer.HorizontalScrollMode(horizontal ? winrt::ScrollMode::Auto : winrt::ScrollMode::Disabled);
scrollViewer.VerticalScrollMode(horizontal ? winrt::ScrollMode::Disabled : winrt::ScrollMode::Auto);
m_isHorizontal = horizontal;
ScrollViewUWPImplementation(scrollViewer).SetHorizontal(horizontal);
SetScrollMode(scrollViewer);
}
}
if (propertyName == "scrollEnabled")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if [](start = 4, length = 2)

else if

{
const auto [valid, scrollEnabled] = getPropertyAndValidity(propertyValue, true);
if (valid)
{
m_isScrollingEnabled = scrollEnabled;
SetScrollMode(scrollViewer);
}
}
else if (propertyName == "showsHorizontalScrollIndicator")
Expand Down Expand Up @@ -413,6 +425,14 @@ std::tuple<bool, T> ScrollViewShadowNode::getPropertyAndValidity(folly::dynamic
return std::make_tuple(false, defaultValue);
}

void ScrollViewShadowNode::SetScrollMode(const winrt::ScrollViewer& scrollViewer)
{
const auto horizontalScrollingEnabled = m_isScrollingEnabled && m_isHorizontal;
const auto verticalScrollingEnabled = m_isScrollingEnabled && !m_isHorizontal;
scrollViewer.HorizontalScrollMode(horizontalScrollingEnabled ? winrt::ScrollMode::Auto : winrt::ScrollMode::Disabled);
scrollViewer.VerticalScrollMode(verticalScrollingEnabled ? winrt::ScrollMode::Auto : winrt::ScrollMode::Disabled);
}

ScrollViewManager::ScrollViewManager(const std::shared_ptr<IReactInstance>& reactInstance)
: Super(reactInstance)
{
Expand All @@ -425,6 +445,7 @@ const char* ScrollViewManager::GetName() const

folly::dynamic ScrollViewManager::GetCommands() const
{

auto commands = Super::GetCommands();
commands.update(folly::dynamic::object
("scrollTo", static_cast<std::underlying_type_t<ScrollViewCommands>>(ScrollViewCommands::ScrollTo))
Expand All @@ -439,6 +460,7 @@ folly::dynamic ScrollViewManager::GetNativeProps() const

props.update(folly::dynamic::object
("horizontal", "boolean")
("scrollEnabled", "boolean")
("showsHorizontalScrollIndicator", "boolean")
("showsVerticalScrollIndicator", "boolean")
("minimumZoomScale", "float")
Expand Down Expand Up @@ -468,7 +490,7 @@ folly::dynamic ScrollViewManager::GetExportedCustomDirectEventTypeConstants() co

return directEvents;
}

XamlView ScrollViewManager::CreateViewCore(int64_t tag)
{
const auto scrollViewer = [this]()
Expand Down