[WCiOS17] Use registerForTraitChanges in refund views (#16076)

iamgabrielma · web-flow · commit 03f2ff1fbb48 · 2025-09-08T13:16:29.000+07:00
diff --git a/Modules/Sources/Networking/Model/POSProductVariation.swift b/Modules/Sources/Networking/Model/POSProductVariation.swift
@@ -94,7 +94,8 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
                     guard value.lowercased() == Values.manageStockParent else {
                         let message = "Unexpected manage stock value: \(value)"
                         assertionFailure(message)
-                        DDLogError(message)
+                        let formattedMessage = DDLogMessageFormat(stringLiteral: message)
+                        DDLogError(formattedMessage)
                         return false
                     }
                     return false
diff --git a/Modules/Sources/Networking/Model/Product/ProductVariation.swift b/Modules/Sources/Networking/Model/Product/ProductVariation.swift
@@ -273,7 +273,8 @@ public struct ProductVariation: Codable, GeneratedCopiable, Equatable, Generated
                                                                     guard value.lowercased() == Values.manageStockParent else {
                                                                         let message = "Unexpected manage stock value: \(value)"
                                                                         assertionFailure(message)
-                                                                        DDLogError(message)
+                                                                        let formattedMessage = DDLogMessageFormat(stringLiteral: message)
+                                                                        DDLogError(formattedMessage)
                                                                         return false
                                                                     }
                                                                     return false
diff --git a/WooCommerce/Classes/POS/Presentation/Reusable Views/POSFullScreenCover.swift b/WooCommerce/Classes/POS/Presentation/Reusable Views/POSFullScreenCover.swift
@@ -77,7 +77,7 @@ struct POSFullScreenCoverModifier<CoverContent: View>: ViewModifier {
                     .environmentObject(sheetManager)
                     .environmentObject(coverManager)
             })
-            .onChange(of: isPresented) { newValue in
+            .onChange(of: isPresented) { _, newValue in
                 parentCoverManager.isPresented = newValue
             }
     }
@@ -104,7 +104,7 @@ struct POSFullScreenCoverModifierForItem<Item: Identifiable & Equatable, CoverCo
                     .environmentObject(sheetManager)
                     .environmentObject(coverManager)
             })
-            .onChange(of: item) { newValue in
+            .onChange(of: item) { _, newValue in
                 parentCoverManager.isPresented = newValue != nil
             }
     }
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Cells/OrderTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Cells/OrderTableViewCell.swift
@@ -31,6 +31,11 @@ final class OrderTableViewCell: UITableViewCell & SearchResultCell {
     ///
     @IBOutlet weak var contentStackView: UIStackView!
 
+    /// Retains the content trait registration token, so it's not deallocated immediately
+    ///
+    // periphery: ignore - False negative. Perhaps does not catch non-direct reads?
+    private var contentSizeTraitRegistration: UITraitChangeRegistration?
+
     static func register(for tableView: UITableView) {
         tableView.registerNib(for: self)
     }
@@ -75,17 +80,7 @@ final class OrderTableViewCell: UITableViewCell & SearchResultCell {
 
     }
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        if traitCollection.preferredContentSizeCategory > .extraExtraLarge {
-            contentStackView.axis = .vertical
-        } else {
-            contentStackView.axis = .horizontal
-        }
-    }
-
     // MARK: - Overridden Methods
-
     override func awakeFromNib() {
         super.awakeFromNib()
         configureBackground()
@@ -107,18 +102,40 @@ final class OrderTableViewCell: UITableViewCell & SearchResultCell {
     override func prepareForReuse() {
         super.prepareForReuse()
         paymentStatusLabel.layer.borderColor = UIColor.clear.cgColor
+        contentSizeTraitRegistration = nil
     }
 
     override func updateConfiguration(using state: UICellConfigurationState) {
         super.updateConfiguration(using: state)
         updateDefaultBackgroundConfiguration(using: state)
     }
-}
 
+    override func willMove(toSuperview newSuperview: UIView?) {
+        super.willMove(toSuperview: newSuperview)
+
+        // Registers for trait changes when the cell is about to be added to view hierarchy,
+        // applies initial layout, and cleans up when removed from hierarchy
+        if newSuperview != nil {
+            contentSizeTraitRegistration = registerForTraitChanges([
+                UITraitPreferredContentSizeCategory.self
+            ]) { [weak self] (_: OrderTableViewCell, _: UITraitCollection) in
+                self?.applyContentSizeCategoryLayout()
+            }
+            applyContentSizeCategoryLayout()
+        } else {
+            contentSizeTraitRegistration = nil
+        }
+    }
+}
 
-// MARK: - Private
-//
 private extension OrderTableViewCell {
+    func applyContentSizeCategoryLayout() {
+        if traitCollection.preferredContentSizeCategory > .extraExtraLarge {
+            contentStackView.axis = .vertical
+        } else {
+            contentStackView.axis = .horizontal
+        }
+    }
 
     /// Reset the UI to a "no data" state.
     ///
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Issue Refunds/Cells/RefundItemTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Issue Refunds/Cells/RefundItemTableViewCell.swift
@@ -43,9 +43,17 @@ final class RefundItemTableViewCell: UITableViewCell {
         applyAccessibilityChanges()
     }
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        applyAccessibilityChanges()
+    override func willMove(toSuperview newSuperview: UIView?) {
+        super.willMove(toSuperview: newSuperview)
+        let sizeTraits: [UITrait] = [
+            UITraitPreferredContentSizeCategory.self,
+            UITraitUserInterfaceIdiom.self,
+            UITraitVerticalSizeClass.self
+        ]
+
+        registerForTraitChanges(sizeTraits) { (self: Self, _: UITraitCollection) in
+            self.applyAccessibilityChanges()
+        }
     }
 
     override func updateConfiguration(using state: UICellConfigurationState) {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Issue Refunds/Cells/RefundShippingDetailsTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Issue Refunds/Cells/RefundShippingDetailsTableViewCell.swift
@@ -52,11 +52,16 @@ final class RefundShippingDetailsTableViewCell: UITableViewCell {
         super.awakeFromNib()
         applyCellStyles()
         applyAccessibilityChanges()
-    }
 
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        applyAccessibilityChanges()
+        let traits: [UITrait] = [
+            UITraitPreferredContentSizeCategory.self,
+            UITraitUserInterfaceIdiom.self,
+            UITraitVerticalSizeClass.self
+        ]
+
+        registerForTraitChanges(traits) { (self: Self, _: UITraitCollection) in
+            self.applyAccessibilityChanges()
+        }
     }
 
     override func updateConfiguration(using state: UICellConfigurationState) {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Issue Refunds/IssueRefundViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Issue Refunds/IssueRefundViewController.swift
@@ -47,6 +47,17 @@ final class IssueRefundViewController: UIViewController {
         observeViewModel()
         viewModel.fetch()
         updateWithViewModelContent()
+
+        let traits: [UITrait] = [
+            UITraitPreferredContentSizeCategory.self,
+            UITraitUserInterfaceIdiom.self,
+            UITraitVerticalSizeClass.self
+        ]
+
+        registerForTraitChanges(traits) {(self: Self, _: UITraitCollection) in
+            self.configureHeaderStackView()
+            self.tableView.updateHeaderHeight()
+        }
     }
 
     override func viewWillLayoutSubviews() {
@@ -194,16 +205,6 @@ private extension IssueRefundViewController {
     }
 }
 
-// MARK: Accessibility handling
-//
-extension IssueRefundViewController {
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        configureHeaderStackView()
-        tableView.updateHeaderHeight()
-    }
-}
-
 // MARK: TableView Delegate & DataSource
 extension IssueRefundViewController: UITableViewDelegate, UITableViewDataSource {
 
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Filters/FilteredOrdersHeaderBar.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Filters/FilteredOrdersHeaderBar.swift
@@ -12,6 +12,11 @@ final class FilteredOrdersHeaderBar: UIView {
 
     private let bottomBorder = CALayer()
 
+    /// Retains the content trait registration token, so it's not deallocated immediately
+    ///
+    // periphery: ignore - False negative. Perhaps does not catch non-direct reads?
+    private var contentSizeTraitRegistration: UITraitChangeRegistration?
+
     /// The number of filters applied
     ///
     private var numberOfFilters = 0
@@ -30,6 +35,21 @@ final class FilteredOrdersHeaderBar: UIView {
         updateStackViewAxis(for: traitCollection)
     }
 
+    override func willMove(toSuperview newSuperview: UIView?) {
+        super.willMove(toSuperview: newSuperview)
+
+        if newSuperview != nil {
+            contentSizeTraitRegistration = registerForTraitChanges([
+                UITraitPreferredContentSizeCategory.self
+            ]) { [weak self] (_: FilteredOrdersHeaderBar, _: UITraitCollection) in
+                guard let self = self else { return }
+                self.updateStackViewAxis(for: self.traitCollection)
+            }
+        } else {
+            contentSizeTraitRegistration = nil
+        }
+    }
+
     override func layoutSubviews() {
         super.layoutSubviews()
         adjustBorderOnFrameUpdate()
@@ -55,16 +75,6 @@ final class FilteredOrdersHeaderBar: UIView {
 /// The `Last updated: time` tends to get truncated at larger text sizes by the filter button.
 /// Laying out the overall stack view vertically avoids this with accessibility sizes.
 extension FilteredOrdersHeaderBar {
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-
-        guard let previousTraitCollection,
-              traitCollection.preferredContentSizeCategory != previousTraitCollection.preferredContentSizeCategory else {
-            return
-        }
-        updateStackViewAxis(for: traitCollection)
-    }
-
     private func updateStackViewAxis(for traitCollection: UITraitCollection) {
         if traitCollection.preferredContentSizeCategory.isAccessibilityCategory {
             headerBarLayoutStackView.axis = .vertical

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ struct POSFullScreenCoverModifier<CoverContent: View>: ViewModifier {`
`77`	`77`	`.environmentObject(sheetManager)`
`78`	`78`	`.environmentObject(coverManager)`
`79`	`79`	`})`
`80`		`- .onChange(of: isPresented) { newValue in`
	`80`	`+ .onChange(of: isPresented) { _, newValue in`
`81`	`81`	`parentCoverManager.isPresented = newValue`
`82`	`82`	`}`
`83`	`83`	`}`
`@@ -104,7 +104,7 @@ struct POSFullScreenCoverModifierForItem<Item: Identifiable & Equatable, CoverCo`
`104`	`104`	`.environmentObject(sheetManager)`
`105`	`105`	`.environmentObject(coverManager)`
`106`	`106`	`})`
`107`		`- .onChange(of: item) { newValue in`
	`107`	`+ .onChange(of: item) { _, newValue in`
`108`	`108`	`parentCoverManager.isPresented = newValue != nil`
`109`	`109`	`}`
`110`	`110`	`}`