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.

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

fix: 🐛 [JIRA:0] ThemeManager merge color definitions should not be called frequently #718

Merged
merged 10 commits into from
Jun 25, 2024
Merged
20 changes: 14 additions & 6 deletions Sources/FioriThemeManager/ThemeManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -105,25 +105,33 @@ public class ThemeManager {
private(set) var developerOverrides: [ColorStyle: [ColorVariant: Color]] = [:]
private(set) var styleSheetOverrides: [ColorStyle: [ColorVariant: Color]] = [:]

private static let mergedDeprecatedDefinitions: [ColorStyle: HexColor] = {
return shared.mergedDeprecatedDefinitions()
}()

private static let mergedCompatibleDefinitions: [ColorStyle: ColorStyle] = {
return shared.mergedCompatibleDefinitions()
}()

/// :nodoc:
func hexColor(for style: ColorStyle) -> HexColor? {
switch self.paletteVersion {
#if !os(watchOS)
case .v3_x, .v3_2, .v4, .v5, .v6, .v7, .v8:
let compatibleDefinitions = self.mergedCompatibleDefinitions()
let compatibleDefinitions = ThemeManager.mergedCompatibleDefinitions
guard !compatibleDefinitions.isEmpty else {
return self.mergedDeprecatedDefinitions()[style]
return ThemeManager.mergedDeprecatedDefinitions[style]
}
let _style = compatibleDefinitions[style] ?? style
return self.mergedDeprecatedDefinitions()[_style]
return ThemeManager.mergedDeprecatedDefinitions[_style]
#else
case .v1:
let compatibleDefinitions = self.mergedCompatibleDefinitions()
let compatibleDefinitions = ThemeManager.mergedCompatibleDefinitions
guard !compatibleDefinitions.isEmpty else {
return self.mergedDeprecatedDefinitions()[style]
return ThemeManager.mergedDeprecatedDefinitions[style]
}
let _style = compatibleDefinitions[style] ?? style
return self.mergedDeprecatedDefinitions()[_style]
return ThemeManager.mergedDeprecatedDefinitions[_style]
#endif
default:
return self.palette.hexColor(for: style)
Expand Down
Loading