Skip to content
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

Jump to bottom

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

Merged
merged 3 commits into from
Nov 28, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76670dd
Change TVC updateAppearance to internal
huwilkes Nov 23, 2022
5032779
Fix PopupMenu token sink
huwilkes Nov 23, 2022
33bb15b
Merge branch 'main' into huwilkes/popupMenuTokenSink
huwilkes Nov 28, 2022
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
8 changes: 8 additions & 0 deletions ios/FluentUI/Popup Menu/PopupMenuItemCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ios/FluentUI/Table View/TableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,7 +1830,7 @@ open class TableViewCell: UITableViewCell, TokenizedControlInternal {
updateAppearance()
}

private func updateAppearance() {
internal func updateAppearance() {
updateFonts()
updateTextColors()
updateSelectionImageColor()
Expand Down