Skip to content

Fix stale layout after width change #163

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 23, 2026
Merged

Fix stale layout after width change #163

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion MagazineLayout/LayoutCore/Types/Signposting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ let signpostLog = OSLog(subsystem: "com.airbnb.MagazineLayout", category: "Magaz
enum SignpostName {
static let collectionViewContentSize: StaticString = "MagazineLayout.collectionViewContentSize"
static let prepare: StaticString = "MagazineLayout.prepare"
static let prepareUpdateWidths: StaticString = "MagazineLayout.prepare.prepareUpdateWidths"
static let prepareUpdateLayoutMetrics: StaticString = "MagazineLayout.prepare.prepareUpdateLayoutMetrics"
static let prepareRecreateSectionModels: StaticString = "MagazineLayout.prepare.recreateSectionModels"
static let layoutAttributesForElementsInRect: StaticString = "MagazineLayout.layoutAttributesForElementsInRect"
Expand Down
24 changes: 2 additions & 22 deletions MagazineLayout/Public/MagazineLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,6 @@ public final class MagazineLayout: UICollectionViewLayout {

var reusableIndexPath = IndexPath(item: 0, section: 0)

// Update widths if necessary (e.g. after rotation or other bounds change)
if prepareActions.contains(.updateWidths) {
let signpostID = OSSignpostID(log: signpostLog)
os_signpost(.begin, log: signpostLog, name: SignpostName.prepareUpdateWidths, signpostID: signpostID)

modelState.forEachSectionModel { sectionIndex, sectionModel in
modelState.updateMetrics(
to: metricsForSection(atIndex: sectionIndex),
forSectionAtIndex: sectionIndex,
sectionModel: &sectionModel)
}

os_signpost(.end, log: signpostLog, name: SignpostName.prepareUpdateWidths, signpostID: signpostID)
}

// Update layout metrics if necessary
if prepareActions.contains(.updateLayoutMetrics) {
let signpostID = OSSignpostID(log: signpostLog)
Expand Down Expand Up @@ -928,11 +913,7 @@ public final class MagazineLayout: UICollectionViewLayout {
?? false
if !isSameWidth {
prepareActions.formUnion(.cachePreviousWidth)
if MagazineLayout._enableExperimentalOptimizations {
prepareActions.formUnion(.updateWidths)
} else {
prepareActions.formUnion(.updateLayoutMetrics)
}
prepareActions.formUnion(.updateLayoutMetrics)
}

if context.invalidateLayoutMetrics && shouldInvalidateLayoutMetrics {
Expand Down Expand Up @@ -1013,8 +994,7 @@ public final class MagazineLayout: UICollectionViewLayout {

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

Expand Down
Loading