From acb18d12b8923162ca0abb5c8dd3fcb4175f3935 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Wed, 19 May 2021 10:09:53 -0400 Subject: [PATCH 1/2] main thread fixes header width fixes --- MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift | 2 +- .../Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift index 912a60cb..72b1e7c0 100644 --- a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift +++ b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift @@ -25,7 +25,7 @@ open class HeaderView: Container { guard let margins = molecule.superview?.layoutMarginsGuide else { return } containerHelper.rightConstraint?.isActive = false containerHelper.rightConstraint = margins.rightAnchor.constraint(equalTo: molecule.rightAnchor) - containerHelper.rightConstraint?.priority = .defaultHigh + containerHelper.rightConstraint?.priority = UILayoutPriority(rawValue: 999) containerHelper.rightConstraint?.isActive = true molecule.widthAnchor.constraint(equalToConstant: HeaderMaxWidth).isActive = true } diff --git a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift index 5f3a0914..e7a29e8a 100644 --- a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift +++ b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift @@ -29,7 +29,7 @@ public class MoleculeHeaderView: MoleculeContainer { guard let margins = molecule.superview?.layoutMarginsGuide else { return } containerHelper.rightConstraint?.isActive = false containerHelper.rightConstraint = margins.rightAnchor.constraint(equalTo: molecule.rightAnchor) - containerHelper.rightConstraint?.priority = .defaultHigh + containerHelper.rightConstraint?.priority = UILayoutPriority(rawValue: 999) containerHelper.rightConstraint?.isActive = true molecule.widthAnchor.constraint(lessThanOrEqualToConstant: HeaderMaxWidth).isActive = true } From 06407930ab57fff0e5c9c36aba9d4e10603dacd3 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Fri, 21 May 2021 09:22:17 -0400 Subject: [PATCH 2/2] revert max header width until wee can properly do it --- .../Atomic/Molecules/HeadersAndFooters/Header.swift | 6 ------ .../HeadersAndFooters/MoleculeHeaderView.swift | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift index 72b1e7c0..73b42dea 100644 --- a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift +++ b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift @@ -22,12 +22,6 @@ open class HeaderView: Container { addSubview(molecule) containerHelper.constrainView(molecule) self.molecule = molecule - guard let margins = molecule.superview?.layoutMarginsGuide else { return } - containerHelper.rightConstraint?.isActive = false - containerHelper.rightConstraint = margins.rightAnchor.constraint(equalTo: molecule.rightAnchor) - containerHelper.rightConstraint?.priority = UILayoutPriority(rawValue: 999) - containerHelper.rightConstraint?.isActive = true - molecule.widthAnchor.constraint(equalToConstant: HeaderMaxWidth).isActive = true } // MARK: - MVMCoreViewProtocol diff --git a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift index e7a29e8a..9e4afed6 100644 --- a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift +++ b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift @@ -24,16 +24,6 @@ public class MoleculeHeaderView: MoleculeContainer { // MARK: - MVMCoreViewProtocol //-------------------------------------------------- - public override func addMolecule(_ molecule: UIView) { - super.addMolecule(molecule) - guard let margins = molecule.superview?.layoutMarginsGuide else { return } - containerHelper.rightConstraint?.isActive = false - containerHelper.rightConstraint = margins.rightAnchor.constraint(equalTo: molecule.rightAnchor) - containerHelper.rightConstraint?.priority = UILayoutPriority(rawValue: 999) - containerHelper.rightConstraint?.isActive = true - molecule.widthAnchor.constraint(lessThanOrEqualToConstant: HeaderMaxWidth).isActive = true - } - open override func updateView(_ size: CGFloat) { super.updateView(size) line.updateView(size)