Remove retain cycles (#1374)

microsoft · Nov 17, 2022 · 4d8816c · 4d8816c
1 parent 7b969ee
commit 4d8816c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/ios/FluentUI/SegmentedControl/SegmentedControl.swift b/ios/FluentUI/SegmentedControl/SegmentedControl.swift
@@ -415,7 +415,9 @@ open class SegmentedControl: UIView, TokenizedControlInternal {
     }
 
     public typealias TokenSetKeyType = SegmentedControlTokenSet.Tokens
-    lazy public var tokenSet: SegmentedControlTokenSet = .init(style: { self.style })
+    lazy public var tokenSet: SegmentedControlTokenSet = .init(style: { [weak self] in
+        return self?.style ?? .primaryPill
+    })
     var tokenSetSink: AnyCancellable?
 
     var selectionChangeAnimationDuration: TimeInterval { return 0.2 }

diff --git a/ios/FluentUI/Shimmer/ShimmerView.swift b/ios/FluentUI/Shimmer/ShimmerView.swift
@@ -75,7 +75,9 @@ open class ShimmerView: UIView, TokenizedControlInternal {
 
     // MARK: - TokenizedControl
     public typealias TokenSetKeyType = ShimmerTokenSet.Tokens
-    public lazy var tokenSet: ShimmerTokenSet = .init(style: { self.style })
+    public lazy var tokenSet: ShimmerTokenSet = .init(style: { [weak self] in
+        return self?.style ?? .concealing
+    })
 
     var tokenSetSink: AnyCancellable?
 

diff --git a/ios/FluentUI/Table View/TableViewCell.swift b/ios/FluentUI/Table View/TableViewCell.swift
@@ -182,7 +182,9 @@ open class TableViewCell: UITableViewCell, TokenizedControlInternal {
     class var labelVerticalMarginForOneAndThreeLines: CGFloat { return TableViewCellTokenSet.defaultLabelVerticalMarginForOneAndThreeLines }
 
     public typealias TokenSetKeyType = TableViewCellTokenSet.Tokens
-    public lazy var tokenSet: TableViewCellTokenSet = .init(customViewSize: { self.customViewSize })
+    public lazy var tokenSet: TableViewCellTokenSet = .init(customViewSize: { [weak self] in
+        return self?.customViewSize ?? .default
+    })
 
     var tokenSetSink: AnyCancellable?