Fix PopupMenuItemCell's token sink to not overwrite custom colors (#1398

) * Change TVC updateAppearance to internal * Fix PopupMenu token sink
microsoft · Nov 28, 2022 · 2e5cff7 · 2e5cff7
1 parent ae56f02
commit 2e5cff7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ios/FluentUI/Popup Menu/PopupMenuItemCell.swift b/ios/FluentUI/Popup Menu/PopupMenuItemCell.swift
@@ -96,6 +96,14 @@ class PopupMenuItemCell: TableViewCell, PopupMenuItemTemplateCell {
 
         // until popupmenuitemcell actually supports token system, clients will override colors via cell's backgroundColor property
         backgroundStyleType = .custom
+
+        tokenSetSink = tokenSet.sinkChanges { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.updateAppearance()
+            strongSelf.updateSelectionColors()
+        }
     }
 
     func setup(item: PopupMenuTemplateItem) {

diff --git a/ios/FluentUI/Table View/TableViewCell.swift b/ios/FluentUI/Table View/TableViewCell.swift
@@ -1830,7 +1830,7 @@ open class TableViewCell: UITableViewCell, TokenizedControlInternal {
         updateAppearance()
     }
 
-    private func updateAppearance() {
+    internal func updateAppearance() {
         updateFonts()
         updateTextColors()
         updateSelectionImageColor()