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

Bugfix/datagrid incremental loading fix #4892

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Bugfix/datagrid incremental loading fix #4892

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ce64d0
Update version.json for 7.1.3
michael-hawker Nov 1, 2022
a48ad72
Fixed issue with incremental loading not working when the height of t…
filipwa84 Jun 2, 2023
e2b76af
Fixed issue with incremental loading not working when the height of t…
filipwa84 Jun 2, 2023
ad2bcc9
Merge remote-tracking branch 'filipwa84/bugfix/datagrid-incremental-l…
filipwa84 Jun 2, 2023
fb03a88
Merge branch 'main' into bugfix/datagrid-incremental-loading-fix
filipwa84 Aug 3, 2023
7a827fa
Restored changes to version.json
filipwa84 Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private double EdgedRowsHeightCalculated
// TODO: Update the DetailsHeightEstimate
double totalDetailsHeight = detailsCount * this.RowDetailsHeightEstimate;
double newEdgedRowsHeightCalculated = totalRowsHeight + totalDetailsHeight;
bool loadMoreDataFromIncrementalItemsSource = newEdgedRowsHeightCalculated < _oldEdgedRowsHeightCalculated;
bool loadMoreDataFromIncrementalItemsSource = newEdgedRowsHeightCalculated < _oldEdgedRowsHeightCalculated || (newEdgedRowsHeightCalculated == _oldEdgedRowsHeightCalculated && newEdgedRowsHeightCalculated < CellsHeight);

_oldEdgedRowsHeightCalculated = newEdgedRowsHeightCalculated;

Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "7.1.3-build.{height}",
Copy link
Member

Choose a reason for hiding this comment

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

You shouldn't modify the version.json file here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure where that change came from, I'll remove it.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks, will make it easier to integrate this and migrate the DataGrid in the future. I'll try and look more into that once we ship our upcoming release.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The change to version.json has been reverted

"version": "7.1.3",
"publicReleaseRefSpec": [
"^refs/heads/main$", // we release out of main
"^refs/heads/dev$", // we release out of dev
Expand Down