Skip to content

Adjust content offset when adjusted content insets change #136

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

Merged
brynbodayle merged 5 commits into from
Jun 20, 2025
Merged

Adjust content offset when adjusted content insets change #136

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06cb140
Adjust content offset when bottom inset changes
bryankeller Jun 10, 2025
5b3285b
Add offset adjustment behavior to top and bottom
brynbodayle Jun 20, 2025
841472d
Add unit tests
brynbodayle Jun 20, 2025
352b66f
Remove duplicate header
brynbodayle Jun 20, 2025
b898fd2
Update comment
brynbodayle Jun 20, 2025
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
14 changes: 14 additions & 0 deletions MagazineLayout/Public/MagazineLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,19 @@ public final class MagazineLayout: UICollectionViewLayout {
return
}

// If our layout direction is `bottomToTop`, allow changes to the bottom content inset to
// automatically adjust the content offset. `UICollectionView` behaves this way by default when
// the top content inset changes, so this adds the same behavior to the bottom.
let bottomContentInset = contentInset.bottom
if
case .bottomToTop = verticalLayoutDirection,
let previousBottomContentInset,
previousBottomContentInset != bottomContentInset
{
context.contentOffsetAdjustment.y = bottomContentInset - previousBottomContentInset
}
previousBottomContentInset = bottomContentInset

let shouldInvalidateLayoutMetrics = !context.invalidateEverything &&
!context.invalidateDataSourceCounts

Expand Down Expand Up @@ -899,6 +912,7 @@ public final class MagazineLayout: UICollectionViewLayout {
private var isPerformingAnimatedBoundsChange = false
private var targetContentOffsetAnchor: TargetContentOffsetAnchor?
private var stagedContentOffsetAdjustment: CGPoint?
private var previousBottomContentInset: CGFloat?

// Used to provide the model state with the current visible bounds for the sole purpose of
// supporting pinned headers and footers.
Expand Down