Moved OnLinkClicked event to MarkdownTextBlock.

azchohfi · michael-hawker · commit 6dafb91f463d · 2024-11-25T14:13:03.000-08:00
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomSample.xaml b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomSample.xaml
@@ -1,4 +1,4 @@
-﻿<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="MarkdownTextBlockExperiment.Samples.MarkdownTextBlockCustomSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -25,7 +25,8 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <controls:MarkdownTextBlock Grid.Column="0"
+            <controls:MarkdownTextBlock x:Name="MarkdownTextBlock1"
+                                        Grid.Column="0"
                                         Config="{x:Bind LiveMarkdownConfig, Mode=OneTime}"
                                         Text="{x:Bind MarkdownTextBox.Text, Mode=OneWay}" />
             <TextBox x:Name="MarkdownTextBox"
@@ -37,7 +38,8 @@
                    FontSize="16"
                    FontWeight="Bold"
                    Text="Built-in Sample" />
-        <controls:MarkdownTextBlock Grid.Row="3"
+        <controls:MarkdownTextBlock x:Name="MarkdownTextBlock2"
+                                    Grid.Row="3"
                                     Config="{x:Bind MarkdownConfig, Mode=OneTime}"
                                     Text="{x:Bind Text, Mode=OneTime}" />
     </Grid>
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomSample.xaml.cs
@@ -604,14 +604,14 @@ public MarkdownTextBlockCustomSample()
     {
         this.InitializeComponent();
         _config = new MarkdownConfig();
-        _config.OnLinkClicked += this._config_OnLinkClicked;
         _liveConfig = new MarkdownConfig();
-        _liveConfig.OnLinkClicked += this._config_OnLinkClicked;
         _text = _markdown;
         MarkdownTextBox.Text = "# Hello World\n\n";
+        MarkdownTextBlock1.OnLinkClicked += MarkdownTextBlock_OnLinkClicked;
+        MarkdownTextBlock2.OnLinkClicked += MarkdownTextBlock_OnLinkClicked;
     }
 
-    private void _config_OnLinkClicked(object? sender, LinkClickedEventArgs e)
+    private void MarkdownTextBlock_OnLinkClicked(object? sender, LinkClickedEventArgs e)
     {
         Debug.WriteLine($"Link Clicked: {e.Uri}");
     }
diff --git a/components/MarkdownTextBlock/src/HtmlWriter.cs b/components/MarkdownTextBlock/src/HtmlWriter.cs
@@ -36,7 +36,7 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                         var myHyperlinkButton = new MyHyperlinkButton(node, renderer.Config.BaseUrl);
                         myHyperlinkButton.ClickEvent += (sender, e) =>
                         {
-                            renderer.Config.RaiseLinkClickedEvent(renderer, ((HyperlinkButton)sender).NavigateUri);
+                            renderer.MarkdownTextBlock.RaiseLinkClickedEvent(((HyperlinkButton)sender).NavigateUri);
                         };
                         hyperLink = myHyperlinkButton;
                     }
@@ -45,7 +45,7 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                         var myHyperlink = new MyHyperlink(node, renderer.Config.BaseUrl);
                         myHyperlink.ClickEvent += (sender, e) =>
                         {
-                            renderer.Config.RaiseLinkClickedEvent(renderer, sender.NavigateUri);
+                            renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);
                         };
                         hyperLink = myHyperlink;
                     }
diff --git a/components/MarkdownTextBlock/src/MarkdownConfig.cs b/components/MarkdownTextBlock/src/MarkdownConfig.cs
@@ -12,8 +12,6 @@ public record MarkdownConfig
     public IImageProvider? ImageProvider { get; set; }
     public ISVGRenderer? SVGRenderer { get; set; }
     public MarkdownThemes Themes { get; set; } = MarkdownThemes.Default;
-    public event EventHandler<LinkClickedEventArgs>? OnLinkClicked;
-    internal void RaiseLinkClickedEvent(object? sender, Uri uri) => OnLinkClicked?.Invoke(sender, new LinkClickedEventArgs(uri));
 
     public static MarkdownConfig Default = new();
 }
diff --git a/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs b/components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs
@@ -42,6 +42,10 @@ public string Text
         set => SetValue(TextProperty, value);
     }
 
+    public event EventHandler<LinkClickedEventArgs>? OnLinkClicked;
+
+    internal void RaiseLinkClickedEvent(Uri uri) => OnLinkClicked?.Invoke(this, new LinkClickedEventArgs(uri));
+
     private static void OnConfigChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is MarkdownTextBlock self && e.NewValue != null)
@@ -110,7 +114,7 @@ private void Build()
         {
             if (_renderer == null)
             {
-                _renderer = new WinUIRenderer(_document, Config);
+                _renderer = new WinUIRenderer(_document, Config, this);
             }
             _pipeline.Setup(_renderer);
             ApplyText(false);
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/AutoLinkInlineRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/AutoLinkInlineRenderer.cs
@@ -28,7 +28,7 @@ protected override void Write(WinUIRenderer renderer, AutolinkInline link)
         var autolink = new MyAutolinkInline(link);
         autolink.ClickEvent += (sender, e) =>
         {
-            renderer.Config.RaiseLinkClickedEvent(renderer, sender.NavigateUri);
+            renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);
         };
 
         renderer.Push(autolink);
diff --git a/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/LinkInlineRenderer.cs b/components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/LinkInlineRenderer.cs
@@ -33,7 +33,7 @@ protected override void Write(WinUIRenderer renderer, LinkInline link)
                 var myHyperlinkButton = new MyHyperlinkButton(link, renderer.Config.BaseUrl);
                 myHyperlinkButton.ClickEvent += (sender, e) =>
                 {
-                    renderer.Config.RaiseLinkClickedEvent(renderer, ((HyperlinkButton)sender).NavigateUri);
+                    renderer.MarkdownTextBlock.RaiseLinkClickedEvent(((HyperlinkButton)sender).NavigateUri);
                 };
                 renderer.Push(myHyperlinkButton);
             }
@@ -42,7 +42,7 @@ protected override void Write(WinUIRenderer renderer, LinkInline link)
                 var hyperlink = new MyHyperlink(link, renderer.Config.BaseUrl);
                 hyperlink.ClickEvent += (sender, e) =>
                 {
-                    renderer.Config.RaiseLinkClickedEvent(renderer, sender.NavigateUri);
+                    renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);
                 };
 
                 renderer.Push(hyperlink);
diff --git a/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs b/components/MarkdownTextBlock/src/Renderers/WinUIRenderer.cs
@@ -23,11 +23,13 @@ public MarkdownConfig Config
         get => _config;
         set => _config = value;
     }
+    public MarkdownTextBlock MarkdownTextBlock { get; }
 
-    public WinUIRenderer(MyFlowDocument document, MarkdownConfig config)
+    public WinUIRenderer(MyFlowDocument document, MarkdownConfig config, MarkdownTextBlock markdownTextBlock)
     {
         _buffer = new char[1024];
         Config = config;
+        MarkdownTextBlock = markdownTextBlock;
         FlowDocument = document;
         // set style
         _stack.Push(FlowDocument);

Original file line number	Diff line number	Diff line change
`@@ -604,14 +604,14 @@ public MarkdownTextBlockCustomSample()`
`604`	`604`	`{`
`605`	`605`	`this.InitializeComponent();`
`606`	`606`	`_config = new MarkdownConfig();`
`607`		`- _config.OnLinkClicked += this._config_OnLinkClicked;`
`608`	`607`	`_liveConfig = new MarkdownConfig();`
`609`		`- _liveConfig.OnLinkClicked += this._config_OnLinkClicked;`
`610`	`608`	`_text = _markdown;`
`611`	`609`	`MarkdownTextBox.Text = "# Hello World\n\n";`
	`610`	`+ MarkdownTextBlock1.OnLinkClicked += MarkdownTextBlock_OnLinkClicked;`
	`611`	`+ MarkdownTextBlock2.OnLinkClicked += MarkdownTextBlock_OnLinkClicked;`
`612`	`612`	`}`
`613`	`613`
`614`		`- private void _config_OnLinkClicked(object? sender, LinkClickedEventArgs e)`
	`614`	`+ private void MarkdownTextBlock_OnLinkClicked(object? sender, LinkClickedEventArgs e)`
`615`	`615`	`{`
`616`	`616`	`Debug.WriteLine($"Link Clicked: {e.Uri}");`
`617`	`617`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)`
`36`	`36`	`var myHyperlinkButton = new MyHyperlinkButton(node, renderer.Config.BaseUrl);`
`37`	`37`	`myHyperlinkButton.ClickEvent += (sender, e) =>`
`38`	`38`	`{`
`39`		`- renderer.Config.RaiseLinkClickedEvent(renderer, ((HyperlinkButton)sender).NavigateUri);`
	`39`	`+ renderer.MarkdownTextBlock.RaiseLinkClickedEvent(((HyperlinkButton)sender).NavigateUri);`
`40`	`40`	`};`
`41`	`41`	`hyperLink = myHyperlinkButton;`
`42`	`42`	`}`
`@@ -45,7 +45,7 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)`
`45`	`45`	`var myHyperlink = new MyHyperlink(node, renderer.Config.BaseUrl);`
`46`	`46`	`myHyperlink.ClickEvent += (sender, e) =>`
`47`	`47`	`{`
`48`		`- renderer.Config.RaiseLinkClickedEvent(renderer, sender.NavigateUri);`
	`48`	`+ renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);`
`49`	`49`	`};`
`50`	`50`	`hyperLink = myHyperlink;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ public record MarkdownConfig`
`12`	`12`	`public IImageProvider? ImageProvider { get; set; }`
`13`	`13`	`public ISVGRenderer? SVGRenderer { get; set; }`
`14`	`14`	`public MarkdownThemes Themes { get; set; } = MarkdownThemes.Default;`
`15`		`- public event EventHandler<LinkClickedEventArgs>? OnLinkClicked;`
`16`		`- internal void RaiseLinkClickedEvent(object? sender, Uri uri) => OnLinkClicked?.Invoke(sender, new LinkClickedEventArgs(uri));`
`17`	`15`
`18`	`16`	`public static MarkdownConfig Default = new();`
`19`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,10 @@ public string Text`
`42`	`42`	`set => SetValue(TextProperty, value);`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ public event EventHandler<LinkClickedEventArgs>? OnLinkClicked;`
	`46`	`+`
	`47`	`+ internal void RaiseLinkClickedEvent(Uri uri) => OnLinkClicked?.Invoke(this, new LinkClickedEventArgs(uri));`
	`48`	`+`
`45`	`49`	`private static void OnConfigChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)`
`46`	`50`	`{`
`47`	`51`	`if (d is MarkdownTextBlock self && e.NewValue != null)`
`@@ -110,7 +114,7 @@ private void Build()`
`110`	`114`	`{`
`111`	`115`	`if (_renderer == null)`
`112`	`116`	`{`
`113`		`- _renderer = new WinUIRenderer(_document, Config);`
	`117`	`+ _renderer = new WinUIRenderer(_document, Config, this);`
`114`	`118`	`}`
`115`	`119`	`_pipeline.Setup(_renderer);`
`116`	`120`	`ApplyText(false);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected override void Write(WinUIRenderer renderer, AutolinkInline link)`
`28`	`28`	`var autolink = new MyAutolinkInline(link);`
`29`	`29`	`autolink.ClickEvent += (sender, e) =>`
`30`	`30`	`{`
`31`		`- renderer.Config.RaiseLinkClickedEvent(renderer, sender.NavigateUri);`
	`31`	`+ renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);`
`32`	`32`	`};`
`33`	`33`
`34`	`34`	`renderer.Push(autolink);`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected override void Write(WinUIRenderer renderer, LinkInline link)`
`33`	`33`	`var myHyperlinkButton = new MyHyperlinkButton(link, renderer.Config.BaseUrl);`
`34`	`34`	`myHyperlinkButton.ClickEvent += (sender, e) =>`
`35`	`35`	`{`
`36`		`- renderer.Config.RaiseLinkClickedEvent(renderer, ((HyperlinkButton)sender).NavigateUri);`
	`36`	`+ renderer.MarkdownTextBlock.RaiseLinkClickedEvent(((HyperlinkButton)sender).NavigateUri);`
`37`	`37`	`};`
`38`	`38`	`renderer.Push(myHyperlinkButton);`
`39`	`39`	`}`
`@@ -42,7 +42,7 @@ protected override void Write(WinUIRenderer renderer, LinkInline link)`
`42`	`42`	`var hyperlink = new MyHyperlink(link, renderer.Config.BaseUrl);`
`43`	`43`	`hyperlink.ClickEvent += (sender, e) =>`
`44`	`44`	`{`
`45`		`- renderer.Config.RaiseLinkClickedEvent(renderer, sender.NavigateUri);`
	`45`	`+ renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);`
`46`	`46`	`};`
`47`	`47`
`48`	`48`	`renderer.Push(hyperlink);`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,13 @@ public MarkdownConfig Config`
`23`	`23`	`get => _config;`
`24`	`24`	`set => _config = value;`
`25`	`25`	`}`
	`26`	`+ public MarkdownTextBlock MarkdownTextBlock { get; }`
`26`	`27`
`27`		`- public WinUIRenderer(MyFlowDocument document, MarkdownConfig config)`
	`28`	`+ public WinUIRenderer(MyFlowDocument document, MarkdownConfig config, MarkdownTextBlock markdownTextBlock)`
`28`	`29`	`{`
`29`	`30`	`_buffer = new char[1024];`
`30`	`31`	`Config = config;`
	`32`	`+ MarkdownTextBlock = markdownTextBlock;`
`31`	`33`	`FlowDocument = document;`
`32`	`34`	`// set style`
`33`	`35`	`_stack.Push(FlowDocument);`