Skip to content

Grid: Fixes for minmax, fr proportions and distributing space across multiple tracks#349

Merged
alice-i-cecile merged 30 commits intoDioxusLabs:mainfrom
nicoburns:grid/span-2-tests
Feb 3, 2023
Merged

Grid: Fixes for minmax, fr proportions and distributing space across multiple tracks#349
alice-i-cecile merged 30 commits intoDioxusLabs:mainfrom
nicoburns:grid/span-2-tests

Conversation

@nicoburns
Copy link
Copy Markdown
Collaborator

@nicoburns nicoburns commented Feb 3, 2023

Objective

A bunch of miscellaneous fixes:

  • Distribute space to flexible tracks in proportion to their flex fraction
  • Divide rather than multiply when finding fr using a track's base size
  • Size fr tracks correctly when every track's size is 0fr
  • Never apply fit-content limit when distributing a minimum contribution
  • Pass correct other_axis_tracks to item.known_dimensions() when re-computing rows

And a lot of new tests testing complex track sizing scenarios.

@nicoburns
Grid span 2 tests WIP
7b97c36
@nicoburns
Never apply fit-content limit when distributing a minimum contribution
3409d9c
@nicoburns
Add max-content-fix-content tests
bb03021
@nicoburns
Prioritise max-content tracks over auto tracks when distributing an i…
69116e9 
…tems max-content size
@nicoburns
Add test for distributing accross all non-flex track types
558bba7
@nicoburns
Divide rather than multiply when finding fr using a track's base size
2d7acc9
@nicoburns
Distribute space to flex tracks in proportion to their flex factor
3f27bd2
@nicoburns
Add test for distributing space to flex tracks in proportion to their…
e168126 
… flex factor
@nicoburns
Add test for sizing an fr based on the size of other fr tracks
81f9909
@nicoburns
Fix clippy lints
f0152e6
@nicoburns
Add test with item spanning every track type
d222294
@nicoburns
Test interaction between auto, fr, and minmax with fixed max track si…
7ef0084 
…zing function
@nicoburns
Clamp minimum contribution by fixed track maximum is all spanned trac…
ab96b0b 
…ks have a fixed maximum
@nicoburns
Re-resolve percentage based track sizing functions before re-running …
724572a 
…track sizing algorithm
@nicoburns
Prioritise tracks with a max-content min TSF like those
80e97d2 
with a max-content max TSF
@nicoburns
Pass in limit to distribute_item_space_to_base_size function as callback
f476c19
@nicoburns
Apply step 6 of intrinsic track resolution to percentage max track si…
b77e1cc 
…zing functions

when the container size in that axis is undefined
@nicoburns
Correctly clear intrinsic size caches in the case that we re-run the …
8b785f4 
…track sizing algorithm in order to resolve percentage sizes
@nicoburns
Don't distribute max-content item size to minmax(auto, min-content) t…
ed39f0f 
…racks
@nicoburns
Add tests for content sizing minmax() tracks with a single item
4857862
@nicoburns
cargo fmt
c24c730
@nicoburns
Remove debug prints
4b313a0
@nicoburns
Add monster span test with minmax() tracks
401c083
@nicoburns
Pass correct other_axis_tracks to item.known_dimensions() when re-com…
77de8c5 
…puting rows
@nicoburns
Test index out of bounds
d79584f
@nicoburns
Apply 'non-resolvable percentage as auto' fix to single-span optimisa…
d93c9f5 
…tion
@nicoburns
Remove unnecessary min-content sizing
1441ceb
@nicoburns
Add tests for sub 1.0 fr values
c03303d
@nicoburns
Add tests for flex fractions summing to zero
281966a
@nicoburns
Fix clippy lints
9db0fac
@nicoburns nicoburns added bug Something isn't working testing Additional tests or improvements to the testing infrastructure labels Feb 3, 2023
@nicoburns nicoburns mentioned this pull request Feb 3, 2023
Closed
87 tasks
@alice-i-cecile
Copy link
Copy Markdown
Collaborator

alice-i-cecile commented Feb 3, 2023

5k lines of tests; you weren't kidding.

@alice-i-cecile alice-i-cecile merged commit 69995d9 into DioxusLabs:main Feb 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alice-i-cecile alice-i-cecile alice-i-cecile approved these changes

Assignees

No one assigned

Labels

bug Something isn't working testing Additional tests or improvements to the testing infrastructure

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@nicoburns @alice-i-cecile