Browse Source

Fix selectors with template bindings

pull/9443/head
Max Katz 4 years ago
parent
commit
50efce1bf4
  1. 12
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs

12
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs

@ -208,17 +208,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
if (node is XamlIlCombinatorSelector if (node is XamlIlCombinatorSelector
{ {
SelectorType: XamlIlCombinatorSelector.CombinatorSelectorType.Template SelectorType: XamlIlCombinatorSelector.CombinatorSelectorType.Template
} templateSelector) })
{ {
if (templateSelector.Previous is XamlIlNestingSelector nestingSelector) return node.Previous.TargetType;
{
return nestingSelector.TargetType;
}
if (templateSelector.Previous is XamlIlTypeSelector typeSelector)
{
return typeSelector.TargetType;
}
return null;
} }
node = node.Previous; node = node.Previous;
} }

Loading…
Cancel
Save