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

Scroll viewer layoutbug #2859

Merged
merged 13 commits into from
Aug 8, 2019
Merged

Scroll viewer layoutbug #2859

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9d167a4
Moving picker fix
decrowle Jul 31, 2019
24777e6
Clean up unnecessary junk
decrowle Jul 31, 2019
08ca0dd
Generalize to all winrt::Control types
decrowle Jul 31, 2019
8455d97
Remove comment
decrowle Jul 31, 2019
0e89db2
Change files
decrowle Jul 31, 2019
cb3911b
Add controls to vector and check ShadowNode func needsForceLayout
decrowle Aug 2, 2019
a783433
Clear m_needsForceLayout between calls to DoLayout
decrowle Aug 2, 2019
b74c8a4
Change files
decrowle Aug 2, 2019
11e33aa
More yarn formatting
decrowle Aug 2, 2019
f592b8d
Change to camel case and move NeedsForceLayout check
decrowle Aug 5, 2019
1c70f48
Removing Xaml Control check
decrowle Aug 5, 2019
e689c4b
Rename m_controlNodes to m_extraLayoutNodes
decrowle Aug 7, 2019
7e92fd4
Change try_as to as
decrowle Aug 8, 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
10 changes: 5 additions & 5 deletions vnext/ReactUWP/Modules/NativeUIManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,14 +1011,14 @@ void NativeUIManager::UpdateExtraLayout(int64_t tag) {
if (shadowNode == nullptr)
return;

if (shadowNode->IsExternalLayoutDirty()) {
YGNodeRef yogaNode = GetYogaNode(tag);
if (yogaNode)
shadowNode->DoExtraLayoutPrep(yogaNode);
auto control = shadowNode->GetView().try_as<winrt::Control>();
decrowle marked this conversation as resolved.
Show resolved Hide resolved
if (control != nullptr) {
decrowle marked this conversation as resolved.
Show resolved Hide resolved
control.UpdateLayout();
}

for (int64_t child : shadowNode->m_children)
for (int64_t child : shadowNode->m_children) {
UpdateExtraLayout(child);
}
}

void NativeUIManager::DoLayout() {
Expand Down
16 changes: 0 additions & 16 deletions vnext/ReactUWP/Views/PickerViewManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ class PickerShadowNode : public ShadowNodeBase {
PickerShadowNode();
void createView() override;
void updateProperties(const folly::dynamic &&props) override;
bool IsExternalLayoutDirty() const override {
return m_hasNewItems;
}
void DoExtraLayoutPrep(YGNodeRef yogaNode) override;

private:
void RepopulateItems();
Expand All @@ -40,7 +36,6 @@ class PickerShadowNode : public ShadowNodeBase {

folly::dynamic m_items;
int32_t m_selectedIndex = -1;
bool m_hasNewItems = false;

// FUTURE: remove when we can require RS5+
bool m_isEditableComboboxSupported;
Expand All @@ -55,16 +50,6 @@ PickerShadowNode::PickerShadowNode() : Super() {
L"Windows.UI.Xaml.Controls.ComboBox", L"IsEditableProperty");
}

void PickerShadowNode::DoExtraLayoutPrep(YGNodeRef yogaNode) {
if (!m_hasNewItems)
return;

m_hasNewItems = false;

auto comboBox = GetView().try_as<winrt::ComboBox>();
comboBox.UpdateLayout();
}

void PickerShadowNode::createView() {
Super::createView();
auto combobox = GetView().as<winrt::ComboBox>();
Expand Down Expand Up @@ -167,7 +152,6 @@ void PickerShadowNode::RepopulateItems() {

comboBoxItems.Append(comboboxItem);
}
m_hasNewItems = true;
}
if (m_selectedIndex < static_cast<int32_t>(m_items.size()))
combobox.SelectedIndex(m_selectedIndex);
Expand Down