Skip to content

Fix invalidation after horizontal insets change #164

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
bryankeller merged 1 commit into from
Jun 25, 2026
Merged

Fix invalidation after horizontal insets change #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions MagazineLayout/Public/MagazineLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@ public final class MagazineLayout: UICollectionViewLayout {
_currentCollectionView = collectionView
_delegateMagazineLayout = currentCollectionView.delegate as? UICollectionViewDelegateMagazineLayout

// Save the previous collection view width if necessary
if prepareActions.contains(.cachePreviousWidth) {
// Save the previous collection view width and horizontal insets if necessary
if prepareActions.contains(.cachePreviousHorizontalMetrics) {
cachedCollectionViewWidth = currentCollectionView.bounds.width
cachedHorizontalContentInset = contentInset.left + contentInset.right
}

if
Expand Down Expand Up @@ -905,14 +906,19 @@ public final class MagazineLayout: UICollectionViewLayout {
prepareActions.formUnion(.recreateSectionModels)
}

// Checking `cachedCollectionViewWidth != collectionView?.bounds.size.width` is necessary
// because the collection view's width can change without a `contentSizeAdjustment` occurring.
// Manually checking for a different width or different horizontal insets is necessary because
// these values can change without a `contentSizeAdjustment` occurring.
let isSameWidth = collectionView?.bounds.size.width.isEqual(
to: cachedCollectionViewWidth ?? -.greatestFiniteMagnitude,
screenScale: scale)
?? false
if !isSameWidth {
prepareActions.formUnion(.cachePreviousWidth)
let horizontalContentInset = (collectionView?.adjustedContentInset.left ?? 0) +
(collectionView?.adjustedContentInset.right ?? 0)
let isSameHorizontalContentInset = horizontalContentInset.isEqual(
to: cachedHorizontalContentInset ?? -.greatestFiniteMagnitude,
screenScale: scale)
if !isSameWidth || !isSameHorizontalContentInset {
prepareActions.formUnion(.cachePreviousHorizontalMetrics)
prepareActions.formUnion(.updateLayoutMetrics)
}

Expand Down Expand Up @@ -994,7 +1000,7 @@ public final class MagazineLayout: UICollectionViewLayout {

static let recreateSectionModels = PrepareActions(rawValue: 1 << 0)
static let updateLayoutMetrics = PrepareActions(rawValue: 1 << 1)
static let cachePreviousWidth = PrepareActions(rawValue: 1 << 2)
static let cachePreviousHorizontalMetrics = PrepareActions(rawValue: 1 << 2)
}
private var prepareActions: PrepareActions = []

Expand All @@ -1004,6 +1010,7 @@ public final class MagazineLayout: UICollectionViewLayout {
private var hasDataSourceCountInvalidationBeforeReceivingUpdateItems = false

private var cachedCollectionViewWidth: CGFloat?
private var cachedHorizontalContentInset: CGFloat?
private var previousContentInset: UIEdgeInsets?

// Unowned unsafe references to avoid weak reference overhead.
Expand Down
Loading