diff --git a/src/client/spark/view/Converters/ValueMap/ValueMap.cs b/src/client/spark/view/Converters/ValueMap/ValueMap.cs index 6568cc9e9..fea938b27 100644 --- a/src/client/spark/view/Converters/ValueMap/ValueMap.cs +++ b/src/client/spark/view/Converters/ValueMap/ValueMap.cs @@ -13,12 +13,21 @@ namespace mbts.ui.converters { public IList Map => _map; public object Default { get; set; } + public IValueConverter DefaultConverter { get; set; } public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => - _map.TryGetValue(value ?? KeyValue.NullPlaceholder, out var kv) ? kv.Value : Default; + _map.TryGetValue(value ?? KeyValue.NullPlaceholder, out var kv) ? + kv.Value : + DefaultConverter == null ? + Default : + DefaultConverter.Convert(value, targetType, parameter, culture); public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => - _map.TryGetFirst(kv => Equals(kv.Value, value), out KeyValue result) ? result.Key : Default; + _map.TryGetFirst(kv => Equals(kv.Value, value), out KeyValue result) ? + result.Key : + DefaultConverter == null ? + Default : + DefaultConverter.ConvertBack(value, targetType, parameter, culture); } class KeyValue {