Use bindings for FlowDirection of markup extensions

davidxuang · Jul 3, 2024 · 1b46787 · 1b46787
1 parent a97e94e
commit 1b46787
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 28 deletions.
diff --git a/FluentIcons.Avalonia.Fluent/MarkupExtensions.cs b/FluentIcons.Avalonia.Fluent/MarkupExtensions.cs
@@ -25,9 +25,9 @@ public SymbolIcon ProvideValue(IServiceProvider serviceProvider)
         if (Foreground is not null) icon.Foreground = Foreground;
 
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is Visual elem)
+        if (service?.TargetObject is Visual source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.Bind(Visual.FlowDirectionProperty, source.GetBindingObservable(Visual.FlowDirectionProperty));
         }
 
         return icon;
@@ -53,9 +53,9 @@ public SymbolIconSource ProvideValue(IServiceProvider serviceProvider)
         if (Foreground is not null) icon.Foreground = Foreground;
 
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is Visual elem)
+        if (service?.TargetObject is Visual source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.Bind(Visual.FlowDirectionProperty, source.GetBindingObservable(Visual.FlowDirectionProperty));
         }
 
         return icon;

diff --git a/FluentIcons.Avalonia/MarkupExtensions.cs b/FluentIcons.Avalonia/MarkupExtensions.cs
@@ -25,9 +25,9 @@ public SymbolIcon ProvideValue(IServiceProvider serviceProvider)
         if (Foreground is not null) icon.Foreground = Foreground;
 
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is Visual elem)
+        if (service?.TargetObject is Visual source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.Bind(Visual.FlowDirectionProperty, source.GetBindingObservable(Visual.FlowDirectionProperty));
         }
 
         return icon;

diff --git a/FluentIcons.Maui/SymbolIcon.cs b/FluentIcons.Maui/SymbolIcon.cs
@@ -142,9 +142,9 @@ public SymbolIcon ProvideValue(IServiceProvider serviceProvider)
         if (ForegroundColor is not null) icon.ForegroundColor = ForegroundColor;
 
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is VisualElement elem)
+        if (service?.TargetObject is VisualElement source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.SetBinding(VisualElement.FlowDirectionProperty, new Binding(nameof(FlowDirection), source: source));
         }
 
         return icon;

diff --git a/FluentIcons.Maui/SymbolImageSource.cs b/FluentIcons.Maui/SymbolImageSource.cs
@@ -107,9 +107,9 @@ public SymbolImageSource ProvideValue(IServiceProvider serviceProvider)
         if (Color is not null) icon.Color = Color;
 
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is VisualElement elem)
+        if (service?.TargetObject is VisualElement source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.FlowDirection = source.FlowDirection;
         }
 
         return icon;

diff --git a/FluentIcons.Uwp/SymbolIcon.cs b/FluentIcons.Uwp/SymbolIcon.cs
@@ -5,6 +5,7 @@
 using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Markup;
 using Windows.UI.Xaml.Media;
 using Symbol = FluentIcons.Common.Symbol;
@@ -49,6 +50,27 @@ public SymbolIcon()
         RegisterPropertyChangedCallback(MirroredWhenRightToLeftProperty, OnMirroredWhenRightToLeftChanged);
     }
 
+#if UAP10_0_17763_0
+    internal SymbolIcon(bool bindFlowDirection) : this()
+    {
+        if (!bindFlowDirection)
+            return;
+
+        static void handler(object sender, RoutedEventArgs args)
+        {
+            if (sender is SymbolIcon icon)
+            {
+                icon.Loaded -= handler;
+                icon.SetBinding(
+                    FlowDirectionProperty,
+                    new Binding { Source = icon.Parent, Path = new PropertyPath(nameof(FlowDirection)) });
+            }
+        };
+
+        Loaded += handler;
+    }
+#endif
+
     public Symbol Symbol
     {
         get { return (Symbol)GetValue(SymbolProperty); }
@@ -145,9 +167,6 @@ public class SymbolIconExtension : MarkupExtension
     public Symbol? Symbol { get; set; }
     public IconVariant? IconVariant { get; set; }
     public bool? UseSegoeMetrics { get; set; }
-#if UAP10_0_17763_0
-    public FlowDirection? FlowDirection { get; set; }
-#endif
     public double? FontSize { get; set; }
     public Brush? Foreground { get; set; }
 
@@ -157,21 +176,25 @@ protected override object ProvideValue()
     protected override object ProvideValue(IXamlServiceProvider serviceProvider)
 #endif
     {
-        var icon = new SymbolIcon();
+        var icon = new SymbolIcon(
+#if UAP10_0_17763_0
+            true
+#endif
+            );
 
         if (Symbol.HasValue) icon.Symbol = Symbol.Value;
         if (IconVariant.HasValue) icon.IconVariant = IconVariant.Value;
         if (UseSegoeMetrics.HasValue) icon.UseSegoeMetrics = UseSegoeMetrics.Value;
         if (FontSize.HasValue) icon.FontSize = FontSize.Value;
         if (Foreground is not null) icon.Foreground = Foreground;
 
-#if UAP10_0_17763_0
-        if (FlowDirection.HasValue) icon.FlowDirection = FlowDirection.Value;
-#else
+#if !UAP10_0_17763_0
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is FrameworkElement elem)
+        if (service?.TargetObject is FrameworkElement source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.SetBinding(
+                FrameworkElement.FlowDirectionProperty,
+                new Binding { Source = source, Path = new PropertyPath(nameof(source.FlowDirection)) });
         }
 #endif
 

diff --git a/FluentIcons.Uwp/SymbolIconSource.cs b/FluentIcons.Uwp/SymbolIconSource.cs
@@ -163,9 +163,13 @@ protected override object ProvideValue(IXamlServiceProvider serviceProvider)
         if (FlowDirection.HasValue) icon.FlowDirection = FlowDirection.Value;
 #else
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is FrameworkElement elem)
+        if (service?.TargetObject is FrameworkElement source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.FlowDirection = source.FlowDirection;
+            source.RegisterPropertyChangedCallback(FrameworkElement.FlowDirectionProperty, (obj, args) =>
+            {
+                if (obj is FrameworkElement f) icon.FlowDirection = f.FlowDirection;
+            });
         }
 #endif
 

diff --git a/FluentIcons.WPF/SymbolIcon.cs b/FluentIcons.WPF/SymbolIcon.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Markup;
 using System.Windows.Media;
 using FluentIcons.Common;
@@ -225,9 +226,11 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         if (Foreground is not null) icon.Foreground = Foreground;
 
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is FrameworkElement elem)
+        if (service?.TargetObject is FrameworkElement source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.SetBinding(
+                FrameworkElement.FlowDirectionProperty,
+                new Binding { Source = source, Path = new PropertyPath(nameof(source.FlowDirection)) });
         }
 
         return icon;

diff --git a/FluentIcons.WinUI/SymbolIcon.cs b/FluentIcons.WinUI/SymbolIcon.cs
@@ -5,6 +5,7 @@
 using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Media;
 using Symbol = FluentIcons.Common.Symbol;
@@ -159,9 +160,11 @@ protected override object ProvideValue(IXamlServiceProvider serviceProvider)
         if (Foreground is not null) icon.Foreground = Foreground;
 
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is FrameworkElement elem)
+        if (service?.TargetObject is FrameworkElement source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.SetBinding(
+                FrameworkElement.FlowDirectionProperty,
+                new Binding { Source = source, Path = new PropertyPath(nameof(source.FlowDirection)) });
         }
 
         return icon;

diff --git a/FluentIcons.WinUI/SymbolIconSource.cs b/FluentIcons.WinUI/SymbolIconSource.cs
@@ -153,9 +153,13 @@ protected override object ProvideValue(IXamlServiceProvider serviceProvider)
         if (Foreground is not null) icon.Foreground = Foreground;
 
         var service = serviceProvider.GetService(typeof(IProvideValueTarget)) as IProvideValueTarget;
-        if (service?.TargetObject is FrameworkElement elem)
+        if (service?.TargetObject is FrameworkElement source)
         {
-            icon.FlowDirection = elem.FlowDirection;
+            icon.FlowDirection = source.FlowDirection;
+            source.RegisterPropertyChangedCallback(FrameworkElement.FlowDirectionProperty, (obj, args) =>
+            {
+                if (obj is FrameworkElement elem) icon.FlowDirection = elem.FlowDirection;
+            });
         }
 
         return icon;

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ This package features `<SymbolIcon>` element, and `<SymbolIconSource>` on platfo
 </Window>
 ```
 
-`SymbolIconExtension` and `SymbolIconSourceExtension` have been added since 1.1.242. These extensions will auto-detect `FlowDirection` from parent control, except on (non-Uno) UWP where `IXamlServiceProvider` is not available.
+`SymbolIconExtension` and `SymbolIconSourceExtension` have been added since 1.1.242. These extensions will bind their `FlowDirection` to that of the parent control, except `SymbolIconSourceExtension` on (non-Uno) UWP where `IXamlServiceProvider` is not available.
 
 ### Avalonia