From d70af2472ce4dd89d54755bc686b41c9fc686ab4 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 9 Jan 2026 15:03:30 +0100
Subject: [PATCH 01/22] Adding cornerradius to image

---
 ...MarkdownTextBlockCustomThemeSample.xaml.cs |   7 +-
 .../MarkdownTextBlockCustomThemeSampleBase.cs |  11 +
 .../samples/ThemeOptionsPane.xaml             | 460 +++++++++---------
 .../samples/ThemeOptionsPane.xaml.cs          |   2 +
 .../MarkdownTextBlock/src/MarkdownThemes.cs   |   1 +
 .../src/TextElements/MyImage.cs               |  11 +-
 6 files changed, 269 insertions(+), 223 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
index 9a335dd8d..afdca385a 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
@@ -9,6 +9,7 @@ namespace MarkdownTextBlockExperiment.Samples;
 /// <summary>
 /// A sample demonstrating custom theming options for the MarkdownTextBlock control with live editing.
 /// </summary>
+/// 
 [ToolkitSample(id: nameof(MarkdownTextBlockCustomThemeSample), "Custom Theme", description: "A sample showcasing custom theming options with live editing for headings, code blocks, quotes, tables, and more.")]
 public sealed partial class MarkdownTextBlockCustomThemeSample : MarkdownTextBlockCustomThemeSampleBase
 {
@@ -34,12 +35,16 @@ This sample demonstrates the **custom theming** capabilities of the `MarkdownTex
 
 ## Images
 
-Images can be styled with max width, max height, and stretch options. Notice how the text flows naturally without any gaps above or below the image:
+Images can be styled with max width, max height, corner radius, and stretch options. Notice how the text flows naturally without any gaps above or below the image:
 
 ![Windows Terminal](https://devblogs.microsoft.com/commandline/wp-content/uploads/sites/33/2025/11/0.96-Social-media-image-V2-1024x536.webp)
 
 The image above automatically scales to respect the max width setting while maintaining its aspect ratio. Text continues to flow seamlessly below it.
 
+![Shortcut Conflict](https://devblogs.microsoft.com/commandline/wp-content/uploads/sites/33/2025/09/ShortcutConflict.png)
+
+Here's another image showing how corner radius can be applied to give images rounded corners.
+
 ## Code Blocks
 
 ```csharp
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
index c1c49e5d2..ab6c6a83a 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
@@ -101,6 +101,9 @@ public abstract partial class MarkdownTextBlockCustomThemeSampleBase : Page
     public static readonly DependencyProperty ImageStretchIndexProperty =
         DependencyProperty.Register(nameof(ImageStretchIndex), typeof(int), typeof(MarkdownTextBlockCustomThemeSampleBase), new PropertyMetadata(0));
 
+    public static readonly DependencyProperty ImageCornerRadiusProperty =
+        DependencyProperty.Register(nameof(ImageCornerRadius), typeof(double), typeof(MarkdownTextBlockCustomThemeSampleBase), new PropertyMetadata(0d));
+
     public static readonly DependencyProperty BoldFontWeightIndexProperty =
         DependencyProperty.Register(nameof(BoldFontWeightIndex), typeof(int), typeof(MarkdownTextBlockCustomThemeSampleBase), new PropertyMetadata(0));
 
@@ -283,6 +286,12 @@ public int ImageStretchIndex
         set => SetValue(ImageStretchIndexProperty, value);
     }
 
+    public double ImageCornerRadius
+    {
+        get => (double)GetValue(ImageCornerRadiusProperty);
+        set => SetValue(ImageCornerRadiusProperty, value);
+    }
+
     public int BoldFontWeightIndex
     {
         get => (int)GetValue(BoldFontWeightIndexProperty);
@@ -426,6 +435,7 @@ public MarkdownThemes CreateThemes()
             ImageMaxWidth = ImageMaxWidth,
             ImageMaxHeight = ImageMaxHeight,
             ImageStretch = ImageStretchOptions[ImageStretchIndex],
+            ImageCornerRadius = new CornerRadius(ImageCornerRadius),
 
             BoldFontWeight = BoldFontWeights[BoldFontWeightIndex],
 
@@ -470,6 +480,7 @@ public void ResetToDefaults()
         ImageMaxWidth = 0;
         ImageMaxHeight = 0;
         ImageStretchIndex = 0;
+        ImageCornerRadius = 0;
 
         BoldFontWeightIndex = 0;
 
diff --git a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
index 4946ef686..18752229a 100644
--- a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
+++ b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
@@ -1,44 +1,46 @@
-<!--  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.  -->
-<UserControl x:Class="MarkdownTextBlockExperiment.Samples.ThemeOptionsPane"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="using:MarkdownTextBlockExperiment.Samples"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-             mc:Ignorable="d">
+<!--  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.  -->
+<UserControl
+    x:Class="MarkdownTextBlockExperiment.Samples.ThemeOptionsPane"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:MarkdownTextBlockExperiment.Samples"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d">
 
     <ScrollViewer>
         <StackPanel Spacing="12">
             <!--  Actions  -->
-            <StackPanel Orientation="Horizontal"
-                        Spacing="8">
-                <Button Click="ResetTheme_Click"
-                        Content="Reset to Defaults" />
-                <Button Click="ApplyTheme_Click"
-                        Content="Apply Changes"
-                        Style="{ThemeResource AccentButtonStyle}" />
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <Button Click="ResetTheme_Click" Content="Reset to Defaults" />
+                <Button
+                    Click="ApplyTheme_Click"
+                    Content="Apply Changes"
+                    Style="{ThemeResource AccentButtonStyle}" />
             </StackPanel>
 
             <!--  Headings Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch"
-                           IsExpanded="True">
+            <muxc:Expander
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Stretch"
+                IsExpanded="True">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Headings" />
+                    <TextBlock FontWeight="SemiBold" Text="Headings" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox x:Name="H1FontSizeBox"
-                                    Header="H1 Font Size"
-                                    Maximum="48"
-                                    Minimum="8"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <ComboBox x:Name="H1ColorComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="H1 Color"
-                              SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox
+                        x:Name="H1FontSizeBox"
+                        Header="H1 Font Size"
+                        Maximum="48"
+                        Minimum="8"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <ComboBox
+                        x:Name="H1ColorComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="H1 Color"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="DodgerBlue" />
                         <ComboBoxItem Content="Coral" />
                         <ComboBoxItem Content="MediumSeaGreen" />
@@ -46,33 +48,34 @@
                         <ComboBoxItem Content="Orchid" />
                         <ComboBoxItem Content="Default (Primary)" />
                     </ComboBox>
-                    <muxc:NumberBox x:Name="H2FontSizeBox"
-                                    Header="H2 Font Size"
-                                    Maximum="48"
-                                    Minimum="8"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="H3FontSizeBox"
-                                    Header="H3 Font Size"
-                                    Maximum="48"
-                                    Minimum="8"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="H2FontSizeBox"
+                        Header="H2 Font Size"
+                        Maximum="48"
+                        Minimum="8"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="H3FontSizeBox"
+                        Header="H3 Font Size"
+                        Maximum="48"
+                        Minimum="8"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
                 </StackPanel>
             </muxc:Expander>
 
             <!--  Text Styling Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Text Styling" />
+                    <TextBlock FontWeight="SemiBold" Text="Text Styling" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <ComboBox x:Name="BoldFontWeightComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Bold Font Weight"
-                              SelectionChanged="OnSelectionChanged">
+                    <ComboBox
+                        x:Name="BoldFontWeightComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Bold Font Weight"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Bold" />
                         <ComboBoxItem Content="SemiBold" />
                         <ComboBoxItem Content="Medium" />
@@ -83,61 +86,66 @@
             </muxc:Expander>
 
             <!--  Inline Code Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Inline Code" />
+                    <TextBlock FontWeight="SemiBold" Text="Inline Code" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox x:Name="InlineCodeFontSizeBox"
-                                    Header="Font Size"
-                                    Maximum="24"
-                                    Minimum="8"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="InlineCodePaddingBox"
-                                    Header="Padding"
-                                    Maximum="16"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="InlineCodeCornerRadiusBox"
-                                    Header="Corner Radius"
-                                    Maximum="16"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="InlineCodeBorderThicknessBox"
-                                    Header="Border Thickness"
-                                    Maximum="4"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <ComboBox x:Name="InlineCodeColorComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Foreground Color"
-                              SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox
+                        x:Name="InlineCodeFontSizeBox"
+                        Header="Font Size"
+                        Maximum="24"
+                        Minimum="8"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="InlineCodePaddingBox"
+                        Header="Padding"
+                        Maximum="16"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="InlineCodeCornerRadiusBox"
+                        Header="Corner Radius"
+                        Maximum="16"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="InlineCodeBorderThicknessBox"
+                        Header="Border Thickness"
+                        Maximum="4"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <ComboBox
+                        x:Name="InlineCodeColorComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Foreground Color"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Orange" />
                         <ComboBoxItem Content="Coral" />
                         <ComboBoxItem Content="LimeGreen" />
                         <ComboBoxItem Content="DeepSkyBlue" />
                         <ComboBoxItem Content="Default (Primary)" />
                     </ComboBox>
-                    <ComboBox x:Name="InlineCodeBackgroundColorComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Background Color"
-                              SelectionChanged="OnSelectionChanged">
+                    <ComboBox
+                        x:Name="InlineCodeBackgroundColorComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Background Color"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Blue Tint" />
                         <ComboBoxItem Content="Dark Tint" />
                         <ComboBoxItem Content="Black Tint" />
                         <ComboBoxItem Content="Green Tint" />
                         <ComboBoxItem Content="Default (Theme)" />
                     </ComboBox>
-                    <ComboBox x:Name="InlineCodeBorderColorComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Border Color"
-                              SelectionChanged="OnSelectionChanged">
+                    <ComboBox
+                        x:Name="InlineCodeBorderColorComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Border Color"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="SlateGray" />
                         <ComboBoxItem Content="DimGray" />
                         <ComboBoxItem Content="DarkSlateGray" />
@@ -148,54 +156,58 @@
             </muxc:Expander>
 
             <!--  Code Block Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Code Blocks" />
+                    <TextBlock FontWeight="SemiBold" Text="Code Blocks" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox x:Name="CodeBlockPaddingBox"
-                                    Header="Padding"
-                                    Maximum="24"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="CodeBlockCornerRadiusBox"
-                                    Header="Corner Radius"
-                                    Maximum="16"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="CodeBlockBorderThicknessBox"
-                                    Header="Border Thickness"
-                                    Maximum="4"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <ComboBox x:Name="CodeBlockFontComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Font Family"
-                              SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox
+                        x:Name="CodeBlockPaddingBox"
+                        Header="Padding"
+                        Maximum="24"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="CodeBlockCornerRadiusBox"
+                        Header="Corner Radius"
+                        Maximum="16"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="CodeBlockBorderThicknessBox"
+                        Header="Border Thickness"
+                        Maximum="4"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <ComboBox
+                        x:Name="CodeBlockFontComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Font Family"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Cascadia Code" />
                         <ComboBoxItem Content="Consolas" />
                         <ComboBoxItem Content="Courier New" />
                         <ComboBoxItem Content="Segoe UI" />
                     </ComboBox>
-                    <ComboBox x:Name="CodeBlockBackgroundColorComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Background Color"
-                              SelectionChanged="OnSelectionChanged">
+                    <ComboBox
+                        x:Name="CodeBlockBackgroundColorComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Background Color"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Blue Tint" />
                         <ComboBoxItem Content="Dark Tint" />
                         <ComboBoxItem Content="Black Tint" />
                         <ComboBoxItem Content="Green Tint" />
                         <ComboBoxItem Content="Default (Theme)" />
                     </ComboBox>
-                    <ComboBox x:Name="CodeBlockBorderColorComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Border Color"
-                              SelectionChanged="OnSelectionChanged">
+                    <ComboBox
+                        x:Name="CodeBlockBorderColorComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Border Color"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="SlateGray" />
                         <ComboBoxItem Content="DimGray" />
                         <ComboBoxItem Content="DarkSlateGray" />
@@ -206,35 +218,37 @@
             </muxc:Expander>
 
             <!--  Quote Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Block Quotes" />
+                    <TextBlock FontWeight="SemiBold" Text="Block Quotes" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox x:Name="QuoteBorderWidthBox"
-                                    Header="Border Width"
-                                    Maximum="12"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="QuotePaddingBox"
-                                    Header="Padding"
-                                    Maximum="24"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="QuoteCornerRadiusBox"
-                                    Header="Corner Radius"
-                                    Maximum="16"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <ComboBox x:Name="QuoteColorComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Border Color"
-                              SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox
+                        x:Name="QuoteBorderWidthBox"
+                        Header="Border Width"
+                        Maximum="12"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="QuotePaddingBox"
+                        Header="Padding"
+                        Maximum="24"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="QuoteCornerRadiusBox"
+                        Header="Corner Radius"
+                        Maximum="16"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <ComboBox
+                        x:Name="QuoteColorComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Border Color"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="DodgerBlue" />
                         <ComboBoxItem Content="Gray" />
                         <ComboBoxItem Content="MediumSeaGreen" />
@@ -244,98 +258,106 @@
             </muxc:Expander>
 
             <!--  Lists Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Lists" />
+                    <TextBlock FontWeight="SemiBold" Text="Lists" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox x:Name="ListBulletSpacingBox"
-                                    Header="Bullet Spacing"
-                                    Maximum="20"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="ListGutterWidthBox"
-                                    Header="Gutter Width (Indent)"
-                                    Maximum="60"
-                                    Minimum="10"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="ListBulletSpacingBox"
+                        Header="Bullet Spacing"
+                        Maximum="20"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="ListGutterWidthBox"
+                        Header="Gutter Width (Indent)"
+                        Maximum="60"
+                        Minimum="10"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
                 </StackPanel>
             </muxc:Expander>
 
             <!--  Table Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Tables" />
+                    <TextBlock FontWeight="SemiBold" Text="Tables" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox x:Name="TableCellPaddingBox"
-                                    Header="Cell Padding"
-                                    Maximum="16"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="TableBorderThicknessBox"
-                                    Header="Border Thickness"
-                                    Maximum="4"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="TableCellPaddingBox"
+                        Header="Cell Padding"
+                        Maximum="16"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="TableBorderThicknessBox"
+                        Header="Border Thickness"
+                        Maximum="4"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
                 </StackPanel>
             </muxc:Expander>
 
             <!--  Horizontal Rule Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Horizontal Rule" />
+                    <TextBlock FontWeight="SemiBold" Text="Horizontal Rule" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox x:Name="HorizontalRuleThicknessBox"
-                                    Header="Thickness"
-                                    Maximum="8"
-                                    Minimum="1"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="HorizontalRuleMarginBox"
-                                    Header="Vertical Margin"
-                                    Maximum="32"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="HorizontalRuleThicknessBox"
+                        Header="Thickness"
+                        Maximum="8"
+                        Minimum="1"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="HorizontalRuleMarginBox"
+                        Header="Vertical Margin"
+                        Maximum="32"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
                 </StackPanel>
             </muxc:Expander>
 
             <!--  Images Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch"
-                           HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Images" />
+                    <TextBlock FontWeight="SemiBold" Text="Images" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox x:Name="ImageMaxWidthBox"
-                                    Header="Max Width (0 = no limit)"
-                                    Maximum="1000"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox x:Name="ImageMaxHeightBox"
-                                    Header="Max Height (0 = no limit)"
-                                    Maximum="1000"
-                                    Minimum="0"
-                                    SpinButtonPlacementMode="Compact"
-                                    ValueChanged="OnValueChanged" />
-                    <ComboBox x:Name="ImageStretchComboBox"
-                              HorizontalAlignment="Stretch"
-                              Header="Stretch"
-                              SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox
+                        x:Name="ImageMaxWidthBox"
+                        Header="Max Width (0 = no limit)"
+                        Maximum="1000"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="ImageMaxHeightBox"
+                        Header="Max Height (0 = no limit)"
+                        Maximum="1000"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox
+                        x:Name="ImageCornerRadiusBox"
+                        Header="Corner Radius"
+                        Maximum="50"
+                        Minimum="0"
+                        SpinButtonPlacementMode="Compact"
+                        ValueChanged="OnValueChanged" />
+                    <ComboBox
+                        x:Name="ImageStretchComboBox"
+                        HorizontalAlignment="Stretch"
+                        Header="Stretch"
+                        SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Uniform" />
                         <ComboBoxItem Content="None" />
                         <ComboBoxItem Content="Fill" />
diff --git a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
index ab3c798dc..7e93e9deb 100644
--- a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
+++ b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
@@ -71,6 +71,7 @@ private void LoadValuesFromSample()
         // Images
         ImageMaxWidthBox.Value = _sample.ImageMaxWidth;
         ImageMaxHeightBox.Value = _sample.ImageMaxHeight;
+        ImageCornerRadiusBox.Value = _sample.ImageCornerRadius;
         ImageStretchComboBox.SelectedIndex = _sample.ImageStretchIndex;
     }
 
@@ -123,6 +124,7 @@ private void SyncValuesToSample()
         // Images
         _sample.ImageMaxWidth = ImageMaxWidthBox.Value;
         _sample.ImageMaxHeight = ImageMaxHeightBox.Value;
+        _sample.ImageCornerRadius = ImageCornerRadiusBox.Value;
         _sample.ImageStretchIndex = ImageStretchComboBox.SelectedIndex;
     }
 
diff --git a/components/MarkdownTextBlock/src/MarkdownThemes.cs b/components/MarkdownTextBlock/src/MarkdownThemes.cs
index f5742ccbb..e1d518679 100644
--- a/components/MarkdownTextBlock/src/MarkdownThemes.cs
+++ b/components/MarkdownTextBlock/src/MarkdownThemes.cs
@@ -120,6 +120,7 @@ public sealed class MarkdownThemes : DependencyObject
     public double ImageMaxWidth { get; set; } = 0; // 0 = no constraint
     public double ImageMaxHeight { get; set; } = 0;
     public Stretch ImageStretch { get; set; } = Stretch.Uniform;
+    public CornerRadius ImageCornerRadius { get; set; } = new CornerRadius(0);
 
     // Table styling
     public Brush TableBorderBrush { get; set; } = new SolidColorBrush(Colors.Gray);
diff --git a/components/MarkdownTextBlock/src/TextElements/MyImage.cs b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
index feb039f1d..829286d26 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyImage.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
@@ -12,6 +12,7 @@ namespace CommunityToolkit.WinUI.Controls.TextElements;
 internal class MyImage : IAddChild
 {
     private InlineUIContainer _container = new InlineUIContainer();
+    private Border _border = new Border();
     private LinkInline? _linkInline;
     private Image _image = new Image();
     private Uri _uri;
@@ -84,7 +85,8 @@ out var height
     private void Init()
     {
         _image.Loaded += LoadImage;
-        _container.Child = _image;
+        _border.Child = _image;
+        _container.Child = _border;
     }
 
     private async void LoadImage(object sender, RoutedEventArgs e)
@@ -95,7 +97,7 @@ private async void LoadImage(object sender, RoutedEventArgs e)
             if (_imageProvider != null && _imageProvider.ShouldUseThisProvider(_uri.AbsoluteUri))
             {
                 _image = await _imageProvider.GetImage(_uri.AbsoluteUri);
-                _container.Child = _image;
+                _border.Child = _image;
             }
             else
             {
@@ -119,7 +121,7 @@ private async void LoadImage(object sender, RoutedEventArgs e)
                     if (resImage != null)
                     {
                         _image = resImage;
-                        _container.Child = _image;
+                        _border.Child = _image;
                     }
                 }
                 else
@@ -185,6 +187,9 @@ private async void LoadImage(object sender, RoutedEventArgs e)
             _image.Width = finalWidth;
             _image.Height = finalHeight;
             _image.Stretch = _themes.ImageStretch;
+
+            // Apply corner radius via the border
+            _border.CornerRadius = _themes.ImageCornerRadius;
         }
         catch (Exception) { }
     }

From 86ce5b628760d9902109447490fdc9c3fccc3a13 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 9 Jan 2026 15:18:59 +0100
Subject: [PATCH 02/22] Making images scale accordingly

---
 .../MarkdownTextBlockCustomThemeSampleBase.cs | 11 ---
 .../samples/ThemeOptionsPane.xaml             |  7 --
 .../samples/ThemeOptionsPane.xaml.cs          |  2 -
 .../MarkdownTextBlock/src/MarkdownThemes.cs   |  1 -
 .../src/TextElements/MyImage.cs               | 74 +++++++------------
 5 files changed, 27 insertions(+), 68 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
index ab6c6a83a..c1c49e5d2 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSampleBase.cs
@@ -101,9 +101,6 @@ public abstract partial class MarkdownTextBlockCustomThemeSampleBase : Page
     public static readonly DependencyProperty ImageStretchIndexProperty =
         DependencyProperty.Register(nameof(ImageStretchIndex), typeof(int), typeof(MarkdownTextBlockCustomThemeSampleBase), new PropertyMetadata(0));
 
-    public static readonly DependencyProperty ImageCornerRadiusProperty =
-        DependencyProperty.Register(nameof(ImageCornerRadius), typeof(double), typeof(MarkdownTextBlockCustomThemeSampleBase), new PropertyMetadata(0d));
-
     public static readonly DependencyProperty BoldFontWeightIndexProperty =
         DependencyProperty.Register(nameof(BoldFontWeightIndex), typeof(int), typeof(MarkdownTextBlockCustomThemeSampleBase), new PropertyMetadata(0));
 
@@ -286,12 +283,6 @@ public int ImageStretchIndex
         set => SetValue(ImageStretchIndexProperty, value);
     }
 
-    public double ImageCornerRadius
-    {
-        get => (double)GetValue(ImageCornerRadiusProperty);
-        set => SetValue(ImageCornerRadiusProperty, value);
-    }
-
     public int BoldFontWeightIndex
     {
         get => (int)GetValue(BoldFontWeightIndexProperty);
@@ -435,7 +426,6 @@ public MarkdownThemes CreateThemes()
             ImageMaxWidth = ImageMaxWidth,
             ImageMaxHeight = ImageMaxHeight,
             ImageStretch = ImageStretchOptions[ImageStretchIndex],
-            ImageCornerRadius = new CornerRadius(ImageCornerRadius),
 
             BoldFontWeight = BoldFontWeights[BoldFontWeightIndex],
 
@@ -480,7 +470,6 @@ public void ResetToDefaults()
         ImageMaxWidth = 0;
         ImageMaxHeight = 0;
         ImageStretchIndex = 0;
-        ImageCornerRadius = 0;
 
         BoldFontWeightIndex = 0;
 
diff --git a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
index 18752229a..be2420293 100644
--- a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
+++ b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
@@ -346,13 +346,6 @@
                         Minimum="0"
                         SpinButtonPlacementMode="Compact"
                         ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="ImageCornerRadiusBox"
-                        Header="Corner Radius"
-                        Maximum="50"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
                     <ComboBox
                         x:Name="ImageStretchComboBox"
                         HorizontalAlignment="Stretch"
diff --git a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
index 7e93e9deb..ab3c798dc 100644
--- a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
+++ b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml.cs
@@ -71,7 +71,6 @@ private void LoadValuesFromSample()
         // Images
         ImageMaxWidthBox.Value = _sample.ImageMaxWidth;
         ImageMaxHeightBox.Value = _sample.ImageMaxHeight;
-        ImageCornerRadiusBox.Value = _sample.ImageCornerRadius;
         ImageStretchComboBox.SelectedIndex = _sample.ImageStretchIndex;
     }
 
@@ -124,7 +123,6 @@ private void SyncValuesToSample()
         // Images
         _sample.ImageMaxWidth = ImageMaxWidthBox.Value;
         _sample.ImageMaxHeight = ImageMaxHeightBox.Value;
-        _sample.ImageCornerRadius = ImageCornerRadiusBox.Value;
         _sample.ImageStretchIndex = ImageStretchComboBox.SelectedIndex;
     }
 
diff --git a/components/MarkdownTextBlock/src/MarkdownThemes.cs b/components/MarkdownTextBlock/src/MarkdownThemes.cs
index e1d518679..f5742ccbb 100644
--- a/components/MarkdownTextBlock/src/MarkdownThemes.cs
+++ b/components/MarkdownTextBlock/src/MarkdownThemes.cs
@@ -120,7 +120,6 @@ public sealed class MarkdownThemes : DependencyObject
     public double ImageMaxWidth { get; set; } = 0; // 0 = no constraint
     public double ImageMaxHeight { get; set; } = 0;
     public Stretch ImageStretch { get; set; } = Stretch.Uniform;
-    public CornerRadius ImageCornerRadius { get; set; } = new CornerRadius(0);
 
     // Table styling
     public Brush TableBorderBrush { get; set; } = new SolidColorBrush(Colors.Gray);
diff --git a/components/MarkdownTextBlock/src/TextElements/MyImage.cs b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
index 829286d26..147672f1a 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyImage.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
@@ -12,7 +12,6 @@ namespace CommunityToolkit.WinUI.Controls.TextElements;
 internal class MyImage : IAddChild
 {
     private InlineUIContainer _container = new InlineUIContainer();
-    private Border _border = new Border();
     private LinkInline? _linkInline;
     private Image _image = new Image();
     private Uri _uri;
@@ -85,8 +84,7 @@ out var height
     private void Init()
     {
         _image.Loaded += LoadImage;
-        _border.Child = _image;
-        _container.Child = _border;
+        _container.Child = _image;
     }
 
     private async void LoadImage(object sender, RoutedEventArgs e)
@@ -97,7 +95,7 @@ private async void LoadImage(object sender, RoutedEventArgs e)
             if (_imageProvider != null && _imageProvider.ShouldUseThisProvider(_uri.AbsoluteUri))
             {
                 _image = await _imageProvider.GetImage(_uri.AbsoluteUri);
-                _border.Child = _image;
+                _container.Child = _image;
             }
             else
             {
@@ -121,7 +119,7 @@ private async void LoadImage(object sender, RoutedEventArgs e)
                     if (resImage != null)
                     {
                         _image = resImage;
-                        _border.Child = _image;
+                        _container.Child = _image;
                     }
                 }
                 else
@@ -139,57 +137,39 @@ private async void LoadImage(object sender, RoutedEventArgs e)
                         await bitmap.SetSourceAsync(stream);
                     }
                     _image.Source = bitmap;
-                    _image.Width = bitmap.PixelWidth == 0 ? bitmap.DecodePixelWidth : bitmap.PixelWidth;
-                    _image.Height = bitmap.PixelHeight == 0 ? bitmap.DecodePixelHeight : bitmap.PixelHeight;
-
+                    // Don't set fixed Width/Height - let layout system handle it
+                    // Store natural dimensions for MaxWidth/MaxHeight constraints
+                    double naturalWidth = bitmap.PixelWidth == 0 ? bitmap.DecodePixelWidth : bitmap.PixelWidth;
+                    double naturalHeight = bitmap.PixelHeight == 0 ? bitmap.DecodePixelHeight : bitmap.PixelHeight;
+
+                    // Use natural size as max constraint so image doesn't upscale
+                    _image.MaxWidth = naturalWidth;
+                    _image.MaxHeight = naturalHeight;
                 }
 
                 _loaded = true;
             }
 
-            // Determine the actual image dimensions
-            double actualWidth = _precedentWidth != 0 ? _precedentWidth : _image.Width;
-            double actualHeight = _precedentHeight != 0 ? _precedentHeight : _image.Height;
-
-            // Apply max constraints and calculate the final size
-            // When using Uniform stretch with max constraints, we need to calculate
-            // the actual rendered size to avoid gaps
-            double finalWidth = actualWidth;
-            double finalHeight = actualHeight;
-
-            bool hasMaxWidth = _themes.ImageMaxWidth > 0;
-            bool hasMaxHeight = _themes.ImageMaxHeight > 0;
-
-            if (hasMaxWidth || hasMaxHeight)
+            // Apply precedent (markdown-specified) dimensions if provided
+            if (_precedentWidth != 0)
             {
-                double scaleX = hasMaxWidth && actualWidth > _themes.ImageMaxWidth 
-                    ? _themes.ImageMaxWidth / actualWidth 
-                    : 1.0;
-                double scaleY = hasMaxHeight && actualHeight > _themes.ImageMaxHeight 
-                    ? _themes.ImageMaxHeight / actualHeight 
-                    : 1.0;
-
-                // For Uniform stretch, use the smaller scale to maintain aspect ratio
-                if (_themes.ImageStretch == Stretch.Uniform || _themes.ImageStretch == Stretch.UniformToFill)
-                {
-                    double uniformScale = Math.Min(scaleX, scaleY);
-                    finalWidth = actualWidth * uniformScale;
-                    finalHeight = actualHeight * uniformScale;
-                }
-                else
-                {
-                    // For other stretch modes, apply constraints independently
-                    finalWidth = actualWidth * scaleX;
-                    finalHeight = actualHeight * scaleY;
-                }
+                _image.MaxWidth = _precedentWidth;
+            }
+            if (_precedentHeight != 0)
+            {
+                _image.MaxHeight = _precedentHeight;
             }
 
-            _image.Width = finalWidth;
-            _image.Height = finalHeight;
+            // Apply theme constraints - these override natural/precedent if smaller
+            if (_themes.ImageMaxWidth > 0 && _themes.ImageMaxWidth < _image.MaxWidth)
+            {
+                _image.MaxWidth = _themes.ImageMaxWidth;
+            }
+            if (_themes.ImageMaxHeight > 0 && _themes.ImageMaxHeight < _image.MaxHeight)
+            {
+                _image.MaxHeight = _themes.ImageMaxHeight;
+            }
             _image.Stretch = _themes.ImageStretch;
-
-            // Apply corner radius via the border
-            _border.CornerRadius = _themes.ImageCornerRadius;
         }
         catch (Exception) { }
     }

From 08114367fd899606cad718d6ff91d51b299e070f Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Fri, 9 Jan 2026 19:17:28 -0600
Subject: [PATCH 03/22] Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../samples/MarkdownTextBlockCustomThemeSample.xaml.cs           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
index afdca385a..953f2ed77 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
@@ -9,7 +9,6 @@ namespace MarkdownTextBlockExperiment.Samples;
 /// <summary>
 /// A sample demonstrating custom theming options for the MarkdownTextBlock control with live editing.
 /// </summary>
-/// 
 [ToolkitSample(id: nameof(MarkdownTextBlockCustomThemeSample), "Custom Theme", description: "A sample showcasing custom theming options with live editing for headings, code blocks, quotes, tables, and more.")]
 public sealed partial class MarkdownTextBlockCustomThemeSample : MarkdownTextBlockCustomThemeSampleBase
 {

From 4cc97980c89d94bf56d6a784aa21799a0364953e Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Fri, 9 Jan 2026 19:36:31 -0600
Subject: [PATCH 04/22] Add ImageProviderConstraintTest to verify theme
 constraint behavior

- Tests that theme constraints should not enlarge images smaller than the constraint
- Tests that precedent dimensions from markdown syntax should be respected
- Tests that theme constraints properly limit larger images
- Reveals current bugs where constraints are always applied regardless of context
---
 .../tests/ImageProviderConstraintTest.cs      | 169 ++++++++++++++++++
 .../tests/MarkdownTextBlock.Tests.projitems   |   1 +
 2 files changed, 170 insertions(+)
 create mode 100644 components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs

diff --git a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
new file mode 100644
index 000000000..03ece5885
--- /dev/null
+++ b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
@@ -0,0 +1,169 @@
+// 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.
+
+using CommunityToolkit.Tooling.TestGen;
+using CommunityToolkit.Tests;
+using CommunityToolkit.WinUI.Controls;
+
+namespace MarkdownTextBlockTests;
+
+/// <summary>
+/// Test class to verify image constraint behavior when using IImageProvider
+/// Regression test for: https://github.com/CommunityToolkit/Labs-Windows/pull/771
+/// </summary>
+[TestClass]
+public partial class ImageProviderConstraintTest : VisualUITestBase
+{
+    /// <summary>
+    /// Mock image provider that returns an image with specific dimensions
+    /// </summary>
+    private class TestImageProvider : IImageProvider
+    {
+        private readonly double _width;
+        private readonly double _height;
+
+        public TestImageProvider(double width = 100, double height = 100)
+        {
+            _width = width;
+            _height = height;
+        }
+
+        public bool ShouldUseThisProvider(string url) => url.StartsWith("test://");
+
+        public Task<Image> GetImage(string url)
+        {
+            var image = new Image
+            {
+                // Simulate a 100x100 image with natural dimensions
+                Width = _width,
+                Height = _height,
+                Source = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage()
+            };
+            return Task.FromResult(image);
+        }
+    }
+
+    [UIThreadTestMethod]
+    public async Task ImageProvider_WithThemeConstraints_ShouldNotApplyConstraintsToSmallerImages()
+    {
+        // Arrange: Image provider returns a 100x100 image
+        var provider = new TestImageProvider(width: 100, height: 100);
+        
+        var config = new MarkdownConfig
+        {
+            ImageProvider = provider,
+            Themes = new MarkdownThemes
+            {
+                // Theme allows images up to 500px wide
+                ImageMaxWidth = 500,
+                ImageMaxHeight = 500
+            }
+        };
+
+        var markdown = new MarkdownTextBlock
+        {
+            Config = config,
+            // Image URL with no precedent dimensions specified
+            Text = "![Test Image](test://example.png)"
+        };
+
+        // Act
+        await LoadTestContentAsync(markdown);
+        
+        // Give the async image loading time to complete
+        await Task.Delay(500);
+        await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
+
+        // Find the image element
+        var image = markdown.FindDescendant<Image>();
+        Assert.IsNotNull(image, "Image element should be rendered");
+
+        // Assert: The image should maintain its natural size (100x100)
+        // NOT be constrained to the theme's larger MaxWidth (500)
+        // 
+        // BUG: Currently fails because when ImageProvider is used,
+        // natural dimensions aren't set on the image, so MaxWidth defaults to Infinity.
+        // Then the theme constraint (500 < Infinity) applies incorrectly.
+        //
+        // Expected behavior: Image should have MaxWidth=100 (its natural size)
+        // Actual behavior: Image has MaxWidth=500 (theme constraint applied incorrectly)
+        
+        Assert.AreEqual(100.0, image.MaxWidth, 0.1, 
+            "Image MaxWidth should be its natural size (100), not the theme constraint (500). " +
+            "When using IImageProvider, natural dimensions must be set before applying theme constraints.");
+    }
+
+    [UIThreadTestMethod]
+    public async Task ImageProvider_WithPrecedentDimensions_ShouldUsePrecedent()
+    {
+        // Arrange: Image provider returns a 100x100 image
+        var provider = new TestImageProvider(width: 100, height: 100);
+        
+        var config = new MarkdownConfig
+        {
+            ImageProvider = provider,
+            Themes = new MarkdownThemes
+            {
+                ImageMaxWidth = 500,
+                ImageMaxHeight = 500
+            }
+        };
+
+        var markdown = new MarkdownTextBlock
+        {
+            Config = config,
+            // Image with explicit width specified in markdown
+            Text = "![Test Image](test://example.png){ width=200 }"
+        };
+
+        // Act
+        await LoadTestContentAsync(markdown);
+        await Task.Delay(500);
+        await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
+
+        var image = markdown.FindDescendant<Image>();
+        Assert.IsNotNull(image, "Image element should be rendered");
+
+        // Assert: Precedent dimensions should be respected
+        Assert.AreEqual(200.0, image.MaxWidth, 0.1, 
+            "Image MaxWidth should respect precedent dimension (200) from markdown");
+    }
+
+    [UIThreadTestMethod]
+    public async Task ImageProvider_WithSmallerThemeConstraint_ShouldApplyThemeConstraint()
+    {
+        // Arrange: Image provider returns a 800x600 image
+        var provider = new TestImageProvider(width: 800, height: 600);
+        
+        var config = new MarkdownConfig
+        {
+            ImageProvider = provider,
+            Themes = new MarkdownThemes
+            {
+                // Theme constrains images to max 400px
+                ImageMaxWidth = 400,
+                ImageMaxHeight = 400
+            }
+        };
+
+        var markdown = new MarkdownTextBlock
+        {
+            Config = config,
+            Text = "![Test Image](test://large.png)"
+        };
+
+        // Act
+        await LoadTestContentAsync(markdown);
+        await Task.Delay(500);
+        await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
+
+        var image = markdown.FindDescendant<Image>();
+        Assert.IsNotNull(image, "Image element should be rendered");
+
+        // Assert: When natural size (800) is larger than theme constraint (400),
+        // the theme constraint should apply
+        Assert.AreEqual(400.0, image.MaxWidth, 0.1, 
+            "Image MaxWidth should be constrained to theme max (400) when natural size (800) is larger");
+    }
+}
diff --git a/components/MarkdownTextBlock/tests/MarkdownTextBlock.Tests.projitems b/components/MarkdownTextBlock/tests/MarkdownTextBlock.Tests.projitems
index c3eab777f..5151d061e 100644
--- a/components/MarkdownTextBlock/tests/MarkdownTextBlock.Tests.projitems
+++ b/components/MarkdownTextBlock/tests/MarkdownTextBlock.Tests.projitems
@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleMarkdownTextBlockTestClass.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ImageProviderConstraintTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ExampleMarkdownTextBlockTestPage.xaml.cs">
       <DependentUpon>ExampleMarkdownTextBlockTestPage.xaml</DependentUpon>
     </Compile>

From db7cf00055e9b707dce9b92d1f7321a8faef938b Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 12 Jan 2026 11:50:26 +0100
Subject: [PATCH 05/22] Remove references about image corner radius

---
 .../samples/MarkdownTextBlockCustomThemeSample.xaml.cs        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
index 953f2ed77..127efbee0 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockCustomThemeSample.xaml.cs
@@ -34,7 +34,7 @@ This sample demonstrates the **custom theming** capabilities of the `MarkdownTex
 
 ## Images
 
-Images can be styled with max width, max height, corner radius, and stretch options. Notice how the text flows naturally without any gaps above or below the image:
+Images can be styled with max width, max height, and stretch options. Notice how the text flows naturally without any gaps above or below the image:
 
 ![Windows Terminal](https://devblogs.microsoft.com/commandline/wp-content/uploads/sites/33/2025/11/0.96-Social-media-image-V2-1024x536.webp)
 
@@ -42,8 +42,6 @@ This sample demonstrates the **custom theming** capabilities of the `MarkdownTex
 
 ![Shortcut Conflict](https://devblogs.microsoft.com/commandline/wp-content/uploads/sites/33/2025/09/ShortcutConflict.png)
 
-Here's another image showing how corner radius can be applied to give images rounded corners.
-
 ## Code Blocks
 
 ```csharp

From acb47553d6114652d269425ba5055b70689341eb Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 12 Jan 2026 11:51:34 +0100
Subject: [PATCH 06/22] Update MyImage.cs

---
 .../MarkdownTextBlock/src/TextElements/MyImage.cs    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components/MarkdownTextBlock/src/TextElements/MyImage.cs b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
index 147672f1a..6b8d36290 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyImage.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
@@ -96,6 +96,18 @@ private async void LoadImage(object sender, RoutedEventArgs e)
             {
                 _image = await _imageProvider.GetImage(_uri.AbsoluteUri);
                 _container.Child = _image;
+                
+                // Set natural dimensions as max constraints from the provider image
+                if (_image.Width > 0)
+                {
+                    _image.MaxWidth = _image.Width;
+                }
+                if (_image.Height > 0)
+                {
+                    _image.MaxHeight = _image.Height;
+                }
+                
+                _loaded = true;
             }
             else
             {

From bcfe6c6be73a0032a877d8bfeb5693a30c6e5b86 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 12 Jan 2026 12:06:33 +0100
Subject: [PATCH 07/22] XAML styling

---
 .../samples/ThemeOptionsPane.xaml             | 453 +++++++++---------
 1 file changed, 219 insertions(+), 234 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
index be2420293..4946ef686 100644
--- a/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
+++ b/components/MarkdownTextBlock/samples/ThemeOptionsPane.xaml
@@ -1,46 +1,44 @@
-<!--  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.  -->
-<UserControl
-    x:Class="MarkdownTextBlockExperiment.Samples.ThemeOptionsPane"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:MarkdownTextBlockExperiment.Samples"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    mc:Ignorable="d">
+<!--  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.  -->
+<UserControl x:Class="MarkdownTextBlockExperiment.Samples.ThemeOptionsPane"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="using:MarkdownTextBlockExperiment.Samples"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+             mc:Ignorable="d">
 
     <ScrollViewer>
         <StackPanel Spacing="12">
             <!--  Actions  -->
-            <StackPanel Orientation="Horizontal" Spacing="8">
-                <Button Click="ResetTheme_Click" Content="Reset to Defaults" />
-                <Button
-                    Click="ApplyTheme_Click"
-                    Content="Apply Changes"
-                    Style="{ThemeResource AccentButtonStyle}" />
+            <StackPanel Orientation="Horizontal"
+                        Spacing="8">
+                <Button Click="ResetTheme_Click"
+                        Content="Reset to Defaults" />
+                <Button Click="ApplyTheme_Click"
+                        Content="Apply Changes"
+                        Style="{ThemeResource AccentButtonStyle}" />
             </StackPanel>
 
             <!--  Headings Section  -->
-            <muxc:Expander
-                HorizontalAlignment="Stretch"
-                HorizontalContentAlignment="Stretch"
-                IsExpanded="True">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch"
+                           IsExpanded="True">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Headings" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Headings" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox
-                        x:Name="H1FontSizeBox"
-                        Header="H1 Font Size"
-                        Maximum="48"
-                        Minimum="8"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <ComboBox
-                        x:Name="H1ColorComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="H1 Color"
-                        SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox x:Name="H1FontSizeBox"
+                                    Header="H1 Font Size"
+                                    Maximum="48"
+                                    Minimum="8"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <ComboBox x:Name="H1ColorComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="H1 Color"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="DodgerBlue" />
                         <ComboBoxItem Content="Coral" />
                         <ComboBoxItem Content="MediumSeaGreen" />
@@ -48,34 +46,33 @@
                         <ComboBoxItem Content="Orchid" />
                         <ComboBoxItem Content="Default (Primary)" />
                     </ComboBox>
-                    <muxc:NumberBox
-                        x:Name="H2FontSizeBox"
-                        Header="H2 Font Size"
-                        Maximum="48"
-                        Minimum="8"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="H3FontSizeBox"
-                        Header="H3 Font Size"
-                        Maximum="48"
-                        Minimum="8"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="H2FontSizeBox"
+                                    Header="H2 Font Size"
+                                    Maximum="48"
+                                    Minimum="8"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="H3FontSizeBox"
+                                    Header="H3 Font Size"
+                                    Maximum="48"
+                                    Minimum="8"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
                 </StackPanel>
             </muxc:Expander>
 
             <!--  Text Styling Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Text Styling" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Text Styling" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <ComboBox
-                        x:Name="BoldFontWeightComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Bold Font Weight"
-                        SelectionChanged="OnSelectionChanged">
+                    <ComboBox x:Name="BoldFontWeightComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Bold Font Weight"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Bold" />
                         <ComboBoxItem Content="SemiBold" />
                         <ComboBoxItem Content="Medium" />
@@ -86,66 +83,61 @@
             </muxc:Expander>
 
             <!--  Inline Code Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Inline Code" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Inline Code" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox
-                        x:Name="InlineCodeFontSizeBox"
-                        Header="Font Size"
-                        Maximum="24"
-                        Minimum="8"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="InlineCodePaddingBox"
-                        Header="Padding"
-                        Maximum="16"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="InlineCodeCornerRadiusBox"
-                        Header="Corner Radius"
-                        Maximum="16"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="InlineCodeBorderThicknessBox"
-                        Header="Border Thickness"
-                        Maximum="4"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <ComboBox
-                        x:Name="InlineCodeColorComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Foreground Color"
-                        SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox x:Name="InlineCodeFontSizeBox"
+                                    Header="Font Size"
+                                    Maximum="24"
+                                    Minimum="8"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="InlineCodePaddingBox"
+                                    Header="Padding"
+                                    Maximum="16"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="InlineCodeCornerRadiusBox"
+                                    Header="Corner Radius"
+                                    Maximum="16"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="InlineCodeBorderThicknessBox"
+                                    Header="Border Thickness"
+                                    Maximum="4"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <ComboBox x:Name="InlineCodeColorComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Foreground Color"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Orange" />
                         <ComboBoxItem Content="Coral" />
                         <ComboBoxItem Content="LimeGreen" />
                         <ComboBoxItem Content="DeepSkyBlue" />
                         <ComboBoxItem Content="Default (Primary)" />
                     </ComboBox>
-                    <ComboBox
-                        x:Name="InlineCodeBackgroundColorComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Background Color"
-                        SelectionChanged="OnSelectionChanged">
+                    <ComboBox x:Name="InlineCodeBackgroundColorComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Background Color"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Blue Tint" />
                         <ComboBoxItem Content="Dark Tint" />
                         <ComboBoxItem Content="Black Tint" />
                         <ComboBoxItem Content="Green Tint" />
                         <ComboBoxItem Content="Default (Theme)" />
                     </ComboBox>
-                    <ComboBox
-                        x:Name="InlineCodeBorderColorComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Border Color"
-                        SelectionChanged="OnSelectionChanged">
+                    <ComboBox x:Name="InlineCodeBorderColorComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Border Color"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="SlateGray" />
                         <ComboBoxItem Content="DimGray" />
                         <ComboBoxItem Content="DarkSlateGray" />
@@ -156,58 +148,54 @@
             </muxc:Expander>
 
             <!--  Code Block Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Code Blocks" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Code Blocks" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox
-                        x:Name="CodeBlockPaddingBox"
-                        Header="Padding"
-                        Maximum="24"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="CodeBlockCornerRadiusBox"
-                        Header="Corner Radius"
-                        Maximum="16"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="CodeBlockBorderThicknessBox"
-                        Header="Border Thickness"
-                        Maximum="4"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <ComboBox
-                        x:Name="CodeBlockFontComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Font Family"
-                        SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox x:Name="CodeBlockPaddingBox"
+                                    Header="Padding"
+                                    Maximum="24"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="CodeBlockCornerRadiusBox"
+                                    Header="Corner Radius"
+                                    Maximum="16"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="CodeBlockBorderThicknessBox"
+                                    Header="Border Thickness"
+                                    Maximum="4"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <ComboBox x:Name="CodeBlockFontComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Font Family"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Cascadia Code" />
                         <ComboBoxItem Content="Consolas" />
                         <ComboBoxItem Content="Courier New" />
                         <ComboBoxItem Content="Segoe UI" />
                     </ComboBox>
-                    <ComboBox
-                        x:Name="CodeBlockBackgroundColorComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Background Color"
-                        SelectionChanged="OnSelectionChanged">
+                    <ComboBox x:Name="CodeBlockBackgroundColorComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Background Color"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Blue Tint" />
                         <ComboBoxItem Content="Dark Tint" />
                         <ComboBoxItem Content="Black Tint" />
                         <ComboBoxItem Content="Green Tint" />
                         <ComboBoxItem Content="Default (Theme)" />
                     </ComboBox>
-                    <ComboBox
-                        x:Name="CodeBlockBorderColorComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Border Color"
-                        SelectionChanged="OnSelectionChanged">
+                    <ComboBox x:Name="CodeBlockBorderColorComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Border Color"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="SlateGray" />
                         <ComboBoxItem Content="DimGray" />
                         <ComboBoxItem Content="DarkSlateGray" />
@@ -218,37 +206,35 @@
             </muxc:Expander>
 
             <!--  Quote Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Block Quotes" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Block Quotes" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox
-                        x:Name="QuoteBorderWidthBox"
-                        Header="Border Width"
-                        Maximum="12"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="QuotePaddingBox"
-                        Header="Padding"
-                        Maximum="24"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="QuoteCornerRadiusBox"
-                        Header="Corner Radius"
-                        Maximum="16"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <ComboBox
-                        x:Name="QuoteColorComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Border Color"
-                        SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox x:Name="QuoteBorderWidthBox"
+                                    Header="Border Width"
+                                    Maximum="12"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="QuotePaddingBox"
+                                    Header="Padding"
+                                    Maximum="24"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="QuoteCornerRadiusBox"
+                                    Header="Corner Radius"
+                                    Maximum="16"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <ComboBox x:Name="QuoteColorComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Border Color"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="DodgerBlue" />
                         <ComboBoxItem Content="Gray" />
                         <ComboBoxItem Content="MediumSeaGreen" />
@@ -258,99 +244,98 @@
             </muxc:Expander>
 
             <!--  Lists Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Lists" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Lists" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox
-                        x:Name="ListBulletSpacingBox"
-                        Header="Bullet Spacing"
-                        Maximum="20"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="ListGutterWidthBox"
-                        Header="Gutter Width (Indent)"
-                        Maximum="60"
-                        Minimum="10"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="ListBulletSpacingBox"
+                                    Header="Bullet Spacing"
+                                    Maximum="20"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="ListGutterWidthBox"
+                                    Header="Gutter Width (Indent)"
+                                    Maximum="60"
+                                    Minimum="10"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
                 </StackPanel>
             </muxc:Expander>
 
             <!--  Table Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Tables" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Tables" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox
-                        x:Name="TableCellPaddingBox"
-                        Header="Cell Padding"
-                        Maximum="16"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="TableBorderThicknessBox"
-                        Header="Border Thickness"
-                        Maximum="4"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="TableCellPaddingBox"
+                                    Header="Cell Padding"
+                                    Maximum="16"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="TableBorderThicknessBox"
+                                    Header="Border Thickness"
+                                    Maximum="4"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
                 </StackPanel>
             </muxc:Expander>
 
             <!--  Horizontal Rule Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Horizontal Rule" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Horizontal Rule" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox
-                        x:Name="HorizontalRuleThicknessBox"
-                        Header="Thickness"
-                        Maximum="8"
-                        Minimum="1"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="HorizontalRuleMarginBox"
-                        Header="Vertical Margin"
-                        Maximum="32"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="HorizontalRuleThicknessBox"
+                                    Header="Thickness"
+                                    Maximum="8"
+                                    Minimum="1"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="HorizontalRuleMarginBox"
+                                    Header="Vertical Margin"
+                                    Maximum="32"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
                 </StackPanel>
             </muxc:Expander>
 
             <!--  Images Section  -->
-            <muxc:Expander HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+            <muxc:Expander HorizontalAlignment="Stretch"
+                           HorizontalContentAlignment="Stretch">
                 <muxc:Expander.Header>
-                    <TextBlock FontWeight="SemiBold" Text="Images" />
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Images" />
                 </muxc:Expander.Header>
                 <StackPanel Spacing="8">
-                    <muxc:NumberBox
-                        x:Name="ImageMaxWidthBox"
-                        Header="Max Width (0 = no limit)"
-                        Maximum="1000"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <muxc:NumberBox
-                        x:Name="ImageMaxHeightBox"
-                        Header="Max Height (0 = no limit)"
-                        Maximum="1000"
-                        Minimum="0"
-                        SpinButtonPlacementMode="Compact"
-                        ValueChanged="OnValueChanged" />
-                    <ComboBox
-                        x:Name="ImageStretchComboBox"
-                        HorizontalAlignment="Stretch"
-                        Header="Stretch"
-                        SelectionChanged="OnSelectionChanged">
+                    <muxc:NumberBox x:Name="ImageMaxWidthBox"
+                                    Header="Max Width (0 = no limit)"
+                                    Maximum="1000"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <muxc:NumberBox x:Name="ImageMaxHeightBox"
+                                    Header="Max Height (0 = no limit)"
+                                    Maximum="1000"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    ValueChanged="OnValueChanged" />
+                    <ComboBox x:Name="ImageStretchComboBox"
+                              HorizontalAlignment="Stretch"
+                              Header="Stretch"
+                              SelectionChanged="OnSelectionChanged">
                         <ComboBoxItem Content="Uniform" />
                         <ComboBoxItem Content="None" />
                         <ComboBoxItem Content="Fill" />

From c7fd09a74b7f17ea1be0af15e5fa5408c44cbab2 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 12 Jan 2026 12:26:41 +0100
Subject: [PATCH 08/22] Fix image scaling

---
 .../src/TextElements/MyImage.cs               | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/components/MarkdownTextBlock/src/TextElements/MyImage.cs b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
index 6b8d36290..1d100881a 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyImage.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyImage.cs
@@ -92,19 +92,28 @@ private async void LoadImage(object sender, RoutedEventArgs e)
         if (_loaded) return;
         try
         {
+            // Track whether we have valid natural dimensions to constrain against
+            bool hasNaturalWidth = false;
+            bool hasNaturalHeight = false;
+
             if (_imageProvider != null && _imageProvider.ShouldUseThisProvider(_uri.AbsoluteUri))
             {
                 _image = await _imageProvider.GetImage(_uri.AbsoluteUri);
                 _container.Child = _image;
                 
-                // Set natural dimensions as max constraints from the provider image
-                if (_image.Width > 0)
+                // Capture natural dimensions as max constraints from the provider image
+                // Then clear fixed Width/Height so images can shrink responsively
+                if (_image.Width > 0 && !double.IsNaN(_image.Width) && !double.IsInfinity(_image.Width))
                 {
                     _image.MaxWidth = _image.Width;
+                    _image.Width = double.NaN; // Clear fixed width to allow shrinking
+                    hasNaturalWidth = true;
                 }
-                if (_image.Height > 0)
+                if (_image.Height > 0 && !double.IsNaN(_image.Height) && !double.IsInfinity(_image.Height))
                 {
                     _image.MaxHeight = _image.Height;
+                    _image.Height = double.NaN; // Clear fixed height to allow shrinking
+                    hasNaturalHeight = true;
                 }
                 
                 _loaded = true;
@@ -155,29 +164,41 @@ private async void LoadImage(object sender, RoutedEventArgs e)
                     double naturalHeight = bitmap.PixelHeight == 0 ? bitmap.DecodePixelHeight : bitmap.PixelHeight;
 
                     // Use natural size as max constraint so image doesn't upscale
-                    _image.MaxWidth = naturalWidth;
-                    _image.MaxHeight = naturalHeight;
+                    if (naturalWidth > 0)
+                    {
+                        _image.MaxWidth = naturalWidth;
+                        hasNaturalWidth = true;
+                    }
+                    if (naturalHeight > 0)
+                    {
+                        _image.MaxHeight = naturalHeight;
+                        hasNaturalHeight = true;
+                    }
                 }
 
                 _loaded = true;
             }
 
             // Apply precedent (markdown-specified) dimensions if provided
+            // Precedent always takes priority and sets a known dimension
             if (_precedentWidth != 0)
             {
                 _image.MaxWidth = _precedentWidth;
+                hasNaturalWidth = true;
             }
             if (_precedentHeight != 0)
             {
                 _image.MaxHeight = _precedentHeight;
+                hasNaturalHeight = true;
             }
 
-            // Apply theme constraints - these override natural/precedent if smaller
-            if (_themes.ImageMaxWidth > 0 && _themes.ImageMaxWidth < _image.MaxWidth)
+            // Apply theme constraints - only if we have a known dimension to constrain
+            // This prevents theme constraints from enlarging images with unknown natural size
+            if (_themes.ImageMaxWidth > 0 && hasNaturalWidth && _themes.ImageMaxWidth < _image.MaxWidth)
             {
                 _image.MaxWidth = _themes.ImageMaxWidth;
             }
-            if (_themes.ImageMaxHeight > 0 && _themes.ImageMaxHeight < _image.MaxHeight)
+            if (_themes.ImageMaxHeight > 0 && hasNaturalHeight && _themes.ImageMaxHeight < _image.MaxHeight)
             {
                 _image.MaxHeight = _themes.ImageMaxHeight;
             }

From ffcd8ff06fe11d4cb8cbd41d8fb78c93ff3c6c10 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 12 Jan 2026 12:26:51 +0100
Subject: [PATCH 09/22] Add visual sample for image rescaling

---
 .../MarkdownTextBlockImageProviderSample.xaml | 137 +++++++++++
 ...rkdownTextBlockImageProviderSample.xaml.cs | 232 ++++++++++++++++++
 2 files changed, 369 insertions(+)
 create mode 100644 components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
 create mode 100644 components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
new file mode 100644
index 000000000..c5271301d
--- /dev/null
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--  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.MarkdownTextBlockImageProviderSample"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:MarkdownTextBlockExperiment.Samples"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel Padding="16"
+                    Spacing="16">
+            <TextBlock Style="{StaticResource TitleTextBlockStyle}"
+                       Text="IImageProvider Constraint Testing" />
+
+            <TextBlock Foreground="{ThemeResource SystemFillColorCautionBrush}"
+                       TextWrapping="Wrap">
+                This sample demonstrates image constraint behavior when using a custom IImageProvider.
+                The test provider returns images with specific dimensions to verify constraint logic.
+            </TextBlock>
+
+            <Border Padding="16"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    CornerRadius="8">
+                <StackPanel Spacing="12">
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Test Configuration" />
+
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="16">
+                        <StackPanel Spacing="4">
+                            <TextBlock FontSize="12"
+                                       Text="Provider Image Width:" />
+                            <NumberBox x:Name="ProviderWidthBox"
+                                       Maximum="2000"
+                                       Minimum="10"
+                                       SpinButtonPlacementMode="Compact"
+                                       Value="100" />
+                        </StackPanel>
+                        <StackPanel Spacing="4">
+                            <TextBlock FontSize="12"
+                                       Text="Provider Image Height:" />
+                            <NumberBox x:Name="ProviderHeightBox"
+                                       Maximum="2000"
+                                       Minimum="10"
+                                       SpinButtonPlacementMode="Compact"
+                                       Value="100" />
+                        </StackPanel>
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal"
+                                Spacing="16">
+                        <StackPanel Spacing="4">
+                            <TextBlock FontSize="12"
+                                       Text="Theme MaxWidth:" />
+                            <NumberBox x:Name="ThemeMaxWidthBox"
+                                       Maximum="2000"
+                                       Minimum="0"
+                                       SpinButtonPlacementMode="Compact"
+                                       Value="500" />
+                        </StackPanel>
+                        <StackPanel Spacing="4">
+                            <TextBlock FontSize="12"
+                                       Text="Theme MaxHeight:" />
+                            <NumberBox x:Name="ThemeMaxHeightBox"
+                                       Maximum="2000"
+                                       Minimum="0"
+                                       SpinButtonPlacementMode="Compact"
+                                       Value="500" />
+                        </StackPanel>
+                    </StackPanel>
+
+                    <Button x:Name="ApplyButton"
+                            Click="ApplyButton_Click"
+                            Content="Apply and Test" />
+                </StackPanel>
+            </Border>
+
+            <!--  Test Cases  -->
+            <Border Padding="16"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    CornerRadius="8">
+                <StackPanel Spacing="12">
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Test Case 1: Small image, larger theme constraint" />
+                    <TextBlock FontSize="12"
+                               Foreground="{ThemeResource SystemFillColorNeutralBrush}"
+                               TextWrapping="Wrap">
+                        Expected: Image should maintain natural size (100x100), NOT be enlarged to theme constraint (500x500).
+                    </TextBlock>
+                    <controls:MarkdownTextBlock x:Name="TestCase1"
+                                                Text="![test](provider://test1.png)" />
+                    <TextBlock x:Name="TestCase1Result"
+                               FontSize="12" />
+                </StackPanel>
+            </Border>
+
+            <Border Padding="16"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    CornerRadius="8">
+                <StackPanel Spacing="12">
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Test Case 2: Large image (800x600), smaller theme constraint (400)" />
+                    <TextBlock FontSize="12"
+                               Foreground="{ThemeResource SystemFillColorNeutralBrush}"
+                               TextWrapping="Wrap">
+                        Expected: Image should be constrained to theme MaxWidth (400), not remain at 800.
+                    </TextBlock>
+                    <controls:MarkdownTextBlock x:Name="TestCase2"
+                                                Text="![test](provider://test2.png)" />
+                    <TextBlock x:Name="TestCase2Result"
+                               FontSize="12" />
+                </StackPanel>
+            </Border>
+
+            <Border Padding="16"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    CornerRadius="8">
+                <StackPanel Spacing="12">
+                    <TextBlock FontWeight="SemiBold"
+                               Text="Test Case 3: Image with no provider dimensions (unknown natural size)" />
+                    <TextBlock FontSize="12"
+                               Foreground="{ThemeResource SystemFillColorNeutralBrush}"
+                               TextWrapping="Wrap">
+                        Expected: Image should NOT have theme constraints applied (MaxWidth should be Infinity), since we don't know if constraints would enlarge it.
+                    </TextBlock>
+                    <controls:MarkdownTextBlock x:Name="TestCase3"
+                                                Text="![test](provider://test3-nodims.png)" />
+                    <TextBlock x:Name="TestCase3Result"
+                               FontSize="12" />
+                </StackPanel>
+            </Border>
+        </StackPanel>
+    </ScrollViewer>
+</Page>
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
new file mode 100644
index 000000000..8516b792d
--- /dev/null
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
@@ -0,0 +1,232 @@
+// 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.
+
+using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Storage.Streams;
+
+namespace MarkdownTextBlockExperiment.Samples;
+
+/// <summary>
+/// Sample demonstrating IImageProvider constraint behavior for manual testing.
+/// This helps verify the fix for: https://github.com/CommunityToolkit/Labs-Windows/pull/771
+/// 
+/// Bug description:
+/// When using IImageProvider, if natural dimensions weren't set on the image, 
+/// theme constraints would incorrectly be applied, potentially enlarging small images.
+/// </summary>
+[ToolkitSample(id: nameof(MarkdownTextBlockImageProviderSample), "Image Provider Constraints", 
+    description: "Manual test for IImageProvider constraint behavior - verifies small images aren't enlarged")]
+public sealed partial class MarkdownTextBlockImageProviderSample : Page
+{
+    public MarkdownTextBlockImageProviderSample()
+    {
+        this.InitializeComponent();
+        this.Loaded += OnLoaded;
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        ApplyConfiguration();
+    }
+
+    private void ApplyButton_Click(object sender, RoutedEventArgs e)
+    {
+        ApplyConfiguration();
+    }
+
+    private void ApplyConfiguration()
+    {
+        var providerWidth = ProviderWidthBox.Value;
+        var providerHeight = ProviderHeightBox.Value;
+        var themeMaxWidth = ThemeMaxWidthBox.Value;
+        var themeMaxHeight = ThemeMaxHeightBox.Value;
+
+        // Test Case 1: Small image with larger theme constraint
+        // The image should NOT be enlarged
+        var provider1 = new TestImageProvider(providerWidth, providerHeight);
+        var config1 = new MarkdownConfig
+        {
+            ImageProvider = provider1,
+            Themes = new MarkdownThemes
+            {
+                ImageMaxWidth = themeMaxWidth,
+                ImageMaxHeight = themeMaxHeight
+            }
+        };
+        TestCase1.Config = config1;
+        TestCase1.Text = "";
+        TestCase1.Text = "![test](provider://test1.png)";
+
+        // Test Case 2: Large image with smaller theme constraint
+        // The image SHOULD be constrained
+        var provider2 = new TestImageProvider(800, 600);
+        var config2 = new MarkdownConfig
+        {
+            ImageProvider = provider2,
+            Themes = new MarkdownThemes
+            {
+                ImageMaxWidth = 400,
+                ImageMaxHeight = 400
+            }
+        };
+        TestCase2.Config = config2;
+        TestCase2.Text = "";
+        TestCase2.Text = "![test](provider://test2.png)";
+
+        // Test Case 3: Image with no dimensions from provider
+        // Theme constraints should NOT be applied
+        var provider3 = new TestImageProvider(0, 0);
+        var config3 = new MarkdownConfig
+        {
+            ImageProvider = provider3,
+            Themes = new MarkdownThemes
+            {
+                ImageMaxWidth = themeMaxWidth,
+                ImageMaxHeight = themeMaxHeight
+            }
+        };
+        TestCase3.Config = config3;
+        TestCase3.Text = "";
+        TestCase3.Text = "![test](provider://test3-nodims.png)";
+
+        // Give time for images to load, then check results
+        DispatcherQueue.TryEnqueue(async () =>
+        {
+            await Task.Delay(1000);
+            UpdateResults();
+        });
+    }
+
+    private void UpdateResults()
+    {
+        var image1 = FindImage(TestCase1);
+        var image2 = FindImage(TestCase2);
+        var image3 = FindImage(TestCase3);
+
+        var providerWidth = ProviderWidthBox.Value;
+        var themeMaxWidth = ThemeMaxWidthBox.Value;
+
+        // Test Case 1: Small image should stay small
+        if (image1 != null)
+        {
+            var pass = Math.Abs(image1.MaxWidth - providerWidth) < 1;
+            TestCase1Result.Text = $"MaxWidth: {image1.MaxWidth:F0} (Expected: {providerWidth}) - {(pass ? "✅ PASS" : "❌ FAIL - Image incorrectly enlarged!")}";
+            TestCase1Result.Foreground = new SolidColorBrush(pass ? Microsoft.UI.Colors.Green : Microsoft.UI.Colors.Red);
+        }
+        else
+        {
+            TestCase1Result.Text = "❌ Image not found";
+            TestCase1Result.Foreground = new SolidColorBrush(Microsoft.UI.Colors.Red);
+        }
+
+        // Test Case 2: Large image should be constrained to 400
+        if (image2 != null)
+        {
+            var pass = Math.Abs(image2.MaxWidth - 400) < 1;
+            TestCase2Result.Text = $"MaxWidth: {image2.MaxWidth:F0} (Expected: 400) - {(pass ? "✅ PASS" : "❌ FAIL")}";
+            TestCase2Result.Foreground = new SolidColorBrush(pass ? Microsoft.UI.Colors.Green : Microsoft.UI.Colors.Red);
+        }
+        else
+        {
+            TestCase2Result.Text = "❌ Image not found";
+            TestCase2Result.Foreground = new SolidColorBrush(Microsoft.UI.Colors.Red);
+        }
+
+        // Test Case 3: No dimensions - theme should NOT be applied
+        if (image3 != null)
+        {
+            var pass = double.IsInfinity(image3.MaxWidth);
+            TestCase3Result.Text = $"MaxWidth: {image3.MaxWidth} (Expected: Infinity) - {(pass ? "✅ PASS" : "❌ FAIL - Theme incorrectly applied!")}";
+            TestCase3Result.Foreground = new SolidColorBrush(pass ? Microsoft.UI.Colors.Green : Microsoft.UI.Colors.Red);
+        }
+        else
+        {
+            TestCase3Result.Text = "❌ Image not found";
+            TestCase3Result.Foreground = new SolidColorBrush(Microsoft.UI.Colors.Red);
+        }
+    }
+
+    private Image? FindImage(MarkdownTextBlock markdown)
+    {
+        return FindDescendant<Image>(markdown);
+    }
+
+    private T? FindDescendant<T>(DependencyObject parent) where T : DependencyObject
+    {
+        var count = VisualTreeHelper.GetChildrenCount(parent);
+        for (int i = 0; i < count; i++)
+        {
+            var child = VisualTreeHelper.GetChild(parent, i);
+            if (child is T result)
+                return result;
+            var descendant = FindDescendant<T>(child);
+            if (descendant != null)
+                return descendant;
+        }
+        return null;
+    }
+
+    /// <summary>
+    /// Test image provider that downloads a real image but reports configurable dimensions.
+    /// This simulates providers that know the image size vs those that don't.
+    /// </summary>
+    private class TestImageProvider : IImageProvider
+    {
+        private readonly double _width;
+        private readonly double _height;
+        private readonly string _realImageUrl;
+
+        // Use a small, fast-loading image
+        private const string DefaultImageUrl = "https://devblogs.microsoft.com/commandline/wp-content/uploads/sites/33/2025/09/ShortcutConflict.png";
+
+        public TestImageProvider(double width, double height, string? realImageUrl = null)
+        {
+            _width = width;
+            _height = height;
+            _realImageUrl = realImageUrl ?? DefaultImageUrl;
+        }
+
+        public bool ShouldUseThisProvider(string url) => url.Contains("provider://");
+
+        public async Task<Image> GetImage(string url)
+        {
+            var image = new Image();
+
+            // Load a real image so it's visible
+            try
+            {
+                var httpClient = new System.Net.Http.HttpClient();
+                var data = await httpClient.GetByteArrayAsync(_realImageUrl);
+                var bitmap = new BitmapImage();
+                using (var stream = new InMemoryRandomAccessStream())
+                {
+                    await stream.WriteAsync(data.AsBuffer());
+                    stream.Seek(0);
+                    await bitmap.SetSourceAsync(stream);
+                }
+                image.Source = bitmap;
+            }
+            catch
+            {
+                // Fallback to empty bitmap if download fails
+                image.Source = new BitmapImage();
+            }
+
+            // Only set dimensions if they're valid
+            // This simulates providers that may or may not know the image size
+            if (_width > 0)
+            {
+                image.Width = _width;
+            }
+            if (_height > 0)
+            {
+                image.Height = _height;
+            }
+
+            return image;
+        }
+    }
+}

From 563f4b4b2ac30cfff81acc62e7013f186d6149a1 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 12 Jan 2026 12:52:13 +0100
Subject: [PATCH 10/22] Update
 components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../tests/ImageProviderConstraintTest.cs           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
index 03ece5885..9deb8238a 100644
--- a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
+++ b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
@@ -80,14 +80,14 @@ public async Task ImageProvider_WithThemeConstraints_ShouldNotApplyConstraintsTo
         Assert.IsNotNull(image, "Image element should be rendered");
 
         // Assert: The image should maintain its natural size (100x100)
-        // NOT be constrained to the theme's larger MaxWidth (500)
-        // 
-        // BUG: Currently fails because when ImageProvider is used,
-        // natural dimensions aren't set on the image, so MaxWidth defaults to Infinity.
-        // Then the theme constraint (500 < Infinity) applies incorrectly.
+        // and NOT be constrained to the theme's larger MaxWidth (500).
         //
-        // Expected behavior: Image should have MaxWidth=100 (its natural size)
-        // Actual behavior: Image has MaxWidth=500 (theme constraint applied incorrectly)
+        // This is a regression test for a previous bug where, when IImageProvider was used,
+        // natural dimensions weren't set on the image, so MaxWidth defaulted to Infinity.
+        // In that case the theme constraint (500 < Infinity) incorrectly applied, forcing MaxWidth=500.
+        //
+        // The purpose of this test is to ensure that the image's MaxWidth is set to its natural size (100)
+        // before theme constraints are evaluated, so the theme constraint is not incorrectly applied.
         
         Assert.AreEqual(100.0, image.MaxWidth, 0.1, 
             "Image MaxWidth should be its natural size (100), not the theme constraint (500). " +

From 9e3524401400092d0ce5e983643fde23bfe03e5b Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 12 Jan 2026 13:30:04 +0100
Subject: [PATCH 11/22] Update MarkdownTextBlockImageProviderSample.xaml

---
 .../MarkdownTextBlockImageProviderSample.xaml | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
index c5271301d..1d81b729e 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
@@ -7,6 +7,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:local="using:MarkdownTextBlockExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
       mc:Ignorable="d">
 
     <ScrollViewer>
@@ -33,20 +34,20 @@
                         <StackPanel Spacing="4">
                             <TextBlock FontSize="12"
                                        Text="Provider Image Width:" />
-                            <NumberBox x:Name="ProviderWidthBox"
-                                       Maximum="2000"
-                                       Minimum="10"
-                                       SpinButtonPlacementMode="Compact"
-                                       Value="100" />
+                            <muxc:NumberBox x:Name="ProviderWidthBox"
+                                            Maximum="2000"
+                                            Minimum="10"
+                                            SpinButtonPlacementMode="Compact"
+                                            Value="100" />
                         </StackPanel>
                         <StackPanel Spacing="4">
                             <TextBlock FontSize="12"
                                        Text="Provider Image Height:" />
-                            <NumberBox x:Name="ProviderHeightBox"
-                                       Maximum="2000"
-                                       Minimum="10"
-                                       SpinButtonPlacementMode="Compact"
-                                       Value="100" />
+                            <muxc:NumberBox x:Name="ProviderHeightBox"
+                                            Maximum="2000"
+                                            Minimum="10"
+                                            SpinButtonPlacementMode="Compact"
+                                            Value="100" />
                         </StackPanel>
                     </StackPanel>
 
@@ -55,20 +56,20 @@
                         <StackPanel Spacing="4">
                             <TextBlock FontSize="12"
                                        Text="Theme MaxWidth:" />
-                            <NumberBox x:Name="ThemeMaxWidthBox"
-                                       Maximum="2000"
-                                       Minimum="0"
-                                       SpinButtonPlacementMode="Compact"
-                                       Value="500" />
+                            <muxc:NumberBox x:Name="ThemeMaxWidthBox"
+                                            Maximum="2000"
+                                            Minimum="0"
+                                            SpinButtonPlacementMode="Compact"
+                                            Value="500" />
                         </StackPanel>
                         <StackPanel Spacing="4">
                             <TextBlock FontSize="12"
                                        Text="Theme MaxHeight:" />
-                            <NumberBox x:Name="ThemeMaxHeightBox"
-                                       Maximum="2000"
-                                       Minimum="0"
-                                       SpinButtonPlacementMode="Compact"
-                                       Value="500" />
+                            <muxc:NumberBox x:Name="ThemeMaxHeightBox"
+                                            Maximum="2000"
+                                            Minimum="0"
+                                            SpinButtonPlacementMode="Compact"
+                                            Value="500" />
                         </StackPanel>
                     </StackPanel>
 

From a2bfa7efe90c0254b47eaa810d3af39b73142ae3 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 12 Jan 2026 16:01:33 +0100
Subject: [PATCH 12/22] Update MarkdownTextBlockImageProviderSample.xaml.cs

---
 .../samples/MarkdownTextBlockImageProviderSample.xaml.cs    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
index 8516b792d..d472cd036 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
@@ -3,8 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.WinUI.Controls;
-using Microsoft.UI.Xaml.Media;
+
+#if WINAPPSDK
 using Microsoft.UI.Xaml.Media.Imaging;
+#elif WINDOWS_UWP
+using Windows.UI.Xaml.Media.Imaging;
+#endif
 using Windows.Storage.Streams;
 
 namespace MarkdownTextBlockExperiment.Samples;

From 45015642bfd6d68a94edc259fc9162a2bf1ce88a Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 13 Jan 2026 14:12:20 +0100
Subject: [PATCH 13/22] Update MarkdownTextBlockImageProviderSample.xaml.cs

---
 .../samples/MarkdownTextBlockImageProviderSample.xaml.cs     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
index d472cd036..009e940d5 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
@@ -179,6 +179,8 @@ private void UpdateResults()
     /// </summary>
     private class TestImageProvider : IImageProvider
     {
+        private static readonly System.Net.Http.HttpClient s_httpClient = new();
+
         private readonly double _width;
         private readonly double _height;
         private readonly string _realImageUrl;
@@ -202,8 +204,7 @@ public async Task<Image> GetImage(string url)
             // Load a real image so it's visible
             try
             {
-                var httpClient = new System.Net.Http.HttpClient();
-                var data = await httpClient.GetByteArrayAsync(_realImageUrl);
+                var data = await s_httpClient.GetByteArrayAsync(_realImageUrl);
                 var bitmap = new BitmapImage();
                 using (var stream = new InMemoryRandomAccessStream())
                 {

From ad46d463016e647032a42afd2c3d0346746651d8 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 13 Jan 2026 14:16:35 +0100
Subject: [PATCH 14/22] Change image tag in tests

---
 .../MarkdownTextBlock/tests/ImageProviderConstraintTest.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
index 9deb8238a..95bed4c9c 100644
--- a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
+++ b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
@@ -65,7 +65,7 @@ public async Task ImageProvider_WithThemeConstraints_ShouldNotApplyConstraintsTo
         {
             Config = config,
             // Image URL with no precedent dimensions specified
-            Text = "![Test Image](test://example.png)"
+            Text = "<img src=\"test://example.png\">"
         };
 
         // Act
@@ -114,7 +114,7 @@ public async Task ImageProvider_WithPrecedentDimensions_ShouldUsePrecedent()
         {
             Config = config,
             // Image with explicit width specified in markdown
-            Text = "![Test Image](test://example.png){ width=200 }"
+            Text = "<img src=\"test://example.png\" width=\"200\">"
         };
 
         // Act
@@ -150,7 +150,7 @@ public async Task ImageProvider_WithSmallerThemeConstraint_ShouldApplyThemeConst
         var markdown = new MarkdownTextBlock
         {
             Config = config,
-            Text = "![Test Image](test://large.png)"
+            Text = "<img src=\"test://large.png\" width=\"200\">"
         };
 
         // Act

From f93803edcb65858b057aa4817edd2a0109dd9956 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 13 Jan 2026 14:19:49 +0100
Subject: [PATCH 15/22] Update MarkdownTextBlock.md

---
 components/MarkdownTextBlock/samples/MarkdownTextBlock.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlock.md b/components/MarkdownTextBlock/samples/MarkdownTextBlock.md
index 87b2bde3e..899a0a353 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlock.md
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlock.md
@@ -40,3 +40,8 @@ Try different styling options for all markdown elements with a custom theme:
 
 > [!Sample MarkdownTextBlockCustomThemeSample]
 
+## Image Provider Constraints
+Test the IImageProvider constraint behavior to verify small images aren't incorrectly enlarged:
+
+> [!Sample MarkdownTextBlockImageProviderSample]
+

From b4fab55def17422142fc3d6d72f8b53c954b23e1 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 13 Jan 2026 16:20:46 +0100
Subject: [PATCH 16/22] Update MarkdownTextBlockImageProviderSample.xaml.cs

---
 ...MarkdownTextBlockImageProviderSample.xaml.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
index 009e940d5..d63a65296 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
@@ -3,13 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.WinUI.Controls;
+using Windows.Storage.Streams;
 
 #if WINAPPSDK
 using Microsoft.UI.Xaml.Media.Imaging;
+using Colors = Microsoft.UI.Colors;
 #elif WINDOWS_UWP
 using Windows.UI.Xaml.Media.Imaging;
+using Colors = Windows.UI.Colors;
 #endif
-using Windows.Storage.Streams;
+
 
 namespace MarkdownTextBlockExperiment.Samples;
 
@@ -118,12 +121,12 @@ private void UpdateResults()
         {
             var pass = Math.Abs(image1.MaxWidth - providerWidth) < 1;
             TestCase1Result.Text = $"MaxWidth: {image1.MaxWidth:F0} (Expected: {providerWidth}) - {(pass ? "✅ PASS" : "❌ FAIL - Image incorrectly enlarged!")}";
-            TestCase1Result.Foreground = new SolidColorBrush(pass ? Microsoft.UI.Colors.Green : Microsoft.UI.Colors.Red);
+            TestCase1Result.Foreground = new SolidColorBrush(pass ? Colors.Green : Colors.Red);
         }
         else
         {
             TestCase1Result.Text = "❌ Image not found";
-            TestCase1Result.Foreground = new SolidColorBrush(Microsoft.UI.Colors.Red);
+            TestCase1Result.Foreground = new SolidColorBrush(Colors.Red);
         }
 
         // Test Case 2: Large image should be constrained to 400
@@ -131,12 +134,12 @@ private void UpdateResults()
         {
             var pass = Math.Abs(image2.MaxWidth - 400) < 1;
             TestCase2Result.Text = $"MaxWidth: {image2.MaxWidth:F0} (Expected: 400) - {(pass ? "✅ PASS" : "❌ FAIL")}";
-            TestCase2Result.Foreground = new SolidColorBrush(pass ? Microsoft.UI.Colors.Green : Microsoft.UI.Colors.Red);
+            TestCase2Result.Foreground = new SolidColorBrush(pass ? Colors.Green : Colors.Red);
         }
         else
         {
             TestCase2Result.Text = "❌ Image not found";
-            TestCase2Result.Foreground = new SolidColorBrush(Microsoft.UI.Colors.Red);
+            TestCase2Result.Foreground = new SolidColorBrush(Colors.Red);
         }
 
         // Test Case 3: No dimensions - theme should NOT be applied
@@ -144,12 +147,12 @@ private void UpdateResults()
         {
             var pass = double.IsInfinity(image3.MaxWidth);
             TestCase3Result.Text = $"MaxWidth: {image3.MaxWidth} (Expected: Infinity) - {(pass ? "✅ PASS" : "❌ FAIL - Theme incorrectly applied!")}";
-            TestCase3Result.Foreground = new SolidColorBrush(pass ? Microsoft.UI.Colors.Green : Microsoft.UI.Colors.Red);
+            TestCase3Result.Foreground = new SolidColorBrush(pass ? Colors.Green : Colors.Red);
         }
         else
         {
             TestCase3Result.Text = "❌ Image not found";
-            TestCase3Result.Foreground = new SolidColorBrush(Microsoft.UI.Colors.Red);
+            TestCase3Result.Foreground = new SolidColorBrush(Colors.Red);
         }
     }
 

From 449275929094a5d27227ff4e1f7028475ddf0151 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 13 Jan 2026 17:01:29 +0100
Subject: [PATCH 17/22] Update MarkdownTextBlockImageProviderSample.xaml.cs

---
 .../samples/MarkdownTextBlockImageProviderSample.xaml.cs  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
index d63a65296..79a4ec072 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
@@ -100,11 +100,9 @@ private void ApplyConfiguration()
         TestCase3.Text = "![test](provider://test3-nodims.png)";
 
         // Give time for images to load, then check results
-        DispatcherQueue.TryEnqueue(async () =>
-        {
-            await Task.Delay(1000);
-            UpdateResults();
-        });
+
+        await Task.Delay(1000);
+        UpdateResults();
     }
 
     private void UpdateResults()

From 079b375ea23285ba99f19c201431b1d695982dd3 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 13 Jan 2026 19:25:57 +0100
Subject: [PATCH 18/22] Update MarkdownTextBlockImageProviderSample.xaml.cs

---
 .../samples/MarkdownTextBlockImageProviderSample.xaml.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
index 79a4ec072..ac0018a0f 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
@@ -44,7 +44,7 @@ private void ApplyButton_Click(object sender, RoutedEventArgs e)
         ApplyConfiguration();
     }
 
-    private void ApplyConfiguration()
+    private async void ApplyConfiguration()
     {
         var providerWidth = ProviderWidthBox.Value;
         var providerHeight = ProviderHeightBox.Value;

From cabc5320629b8c51d83fbe63770edc2595fe4e85 Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Tue, 13 Jan 2026 15:51:12 -0600
Subject: [PATCH 19/22] Revert "Change image tag in tests"

This reverts commit ad46d463016e647032a42afd2c3d0346746651d8.
---
 .../MarkdownTextBlock/tests/ImageProviderConstraintTest.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
index 95bed4c9c..9deb8238a 100644
--- a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
+++ b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
@@ -65,7 +65,7 @@ public async Task ImageProvider_WithThemeConstraints_ShouldNotApplyConstraintsTo
         {
             Config = config,
             // Image URL with no precedent dimensions specified
-            Text = "<img src=\"test://example.png\">"
+            Text = "![Test Image](test://example.png)"
         };
 
         // Act
@@ -114,7 +114,7 @@ public async Task ImageProvider_WithPrecedentDimensions_ShouldUsePrecedent()
         {
             Config = config,
             // Image with explicit width specified in markdown
-            Text = "<img src=\"test://example.png\" width=\"200\">"
+            Text = "![Test Image](test://example.png){ width=200 }"
         };
 
         // Act
@@ -150,7 +150,7 @@ public async Task ImageProvider_WithSmallerThemeConstraint_ShouldApplyThemeConst
         var markdown = new MarkdownTextBlock
         {
             Config = config,
-            Text = "<img src=\"test://large.png\" width=\"200\">"
+            Text = "![Test Image](test://large.png)"
         };
 
         // Act

From 44e39a4edb237d3071f66ac7bfade00e36c34c2b Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Tue, 13 Jan 2026 15:55:39 -0600
Subject: [PATCH 20/22] Use html syntax for specifying custom image size inline
 where appropriate

---
 .../MarkdownTextBlock/tests/ImageProviderConstraintTest.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
index 9deb8238a..f7d58b888 100644
--- a/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
+++ b/components/MarkdownTextBlock/tests/ImageProviderConstraintTest.cs
@@ -114,7 +114,7 @@ public async Task ImageProvider_WithPrecedentDimensions_ShouldUsePrecedent()
         {
             Config = config,
             // Image with explicit width specified in markdown
-            Text = "![Test Image](test://example.png){ width=200 }"
+            Text = "<img src=\"test://example.png\" width=\"200\">"
         };
 
         // Act

From 5a1d4f70e8e7c04747f395961630b289aeafc5c7 Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Tue, 13 Jan 2026 16:00:13 -0600
Subject: [PATCH 21/22] Fix async void issues

---
 .../MarkdownTextBlockImageProviderSample.xaml.cs       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
index ac0018a0f..038a38897 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
@@ -34,17 +34,17 @@ public MarkdownTextBlockImageProviderSample()
         this.Loaded += OnLoaded;
     }
 
-    private void OnLoaded(object sender, RoutedEventArgs e)
+    private async void OnLoaded(object sender, RoutedEventArgs e)
     {
-        ApplyConfiguration();
+        await ApplyConfigurationAsync();
     }
 
-    private void ApplyButton_Click(object sender, RoutedEventArgs e)
+    private async void ApplyButton_Click(object sender, RoutedEventArgs e)
     {
-        ApplyConfiguration();
+        await ApplyConfigurationAsync();
     }
 
-    private async void ApplyConfiguration()
+    private async Task ApplyConfigurationAsync()
     {
         var providerWidth = ProviderWidthBox.Value;
         var providerHeight = ProviderHeightBox.Value;

From b5c2514af99ece8b876d0167dcc277999996ddc9 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Wed, 14 Jan 2026 00:42:27 +0100
Subject: [PATCH 22/22] Removing sample

---
 .../samples/MarkdownTextBlock.md              |   8 +-
 .../MarkdownTextBlockImageProviderSample.xaml | 138 ----------
 ...rkdownTextBlockImageProviderSample.xaml.cs | 238 ------------------
 3 files changed, 1 insertion(+), 383 deletions(-)
 delete mode 100644 components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
 delete mode 100644 components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs

diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlock.md b/components/MarkdownTextBlock/samples/MarkdownTextBlock.md
index 899a0a353..9d419cbac 100644
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlock.md
+++ b/components/MarkdownTextBlock/samples/MarkdownTextBlock.md
@@ -38,10 +38,4 @@ Try typing markdown and see it rendered in real-time:
 ## Custom theme sample
 Try different styling options for all markdown elements with a custom theme:
 
-> [!Sample MarkdownTextBlockCustomThemeSample]
-
-## Image Provider Constraints
-Test the IImageProvider constraint behavior to verify small images aren't incorrectly enlarged:
-
-> [!Sample MarkdownTextBlockImageProviderSample]
-
+> [!Sample MarkdownTextBlockCustomThemeSample]
\ No newline at end of file
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
deleted file mode 100644
index 1d81b729e..000000000
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--  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.MarkdownTextBlockImageProviderSample"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:MarkdownTextBlockExperiment.Samples"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-      mc:Ignorable="d">
-
-    <ScrollViewer>
-        <StackPanel Padding="16"
-                    Spacing="16">
-            <TextBlock Style="{StaticResource TitleTextBlockStyle}"
-                       Text="IImageProvider Constraint Testing" />
-
-            <TextBlock Foreground="{ThemeResource SystemFillColorCautionBrush}"
-                       TextWrapping="Wrap">
-                This sample demonstrates image constraint behavior when using a custom IImageProvider.
-                The test provider returns images with specific dimensions to verify constraint logic.
-            </TextBlock>
-
-            <Border Padding="16"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    CornerRadius="8">
-                <StackPanel Spacing="12">
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Test Configuration" />
-
-                    <StackPanel Orientation="Horizontal"
-                                Spacing="16">
-                        <StackPanel Spacing="4">
-                            <TextBlock FontSize="12"
-                                       Text="Provider Image Width:" />
-                            <muxc:NumberBox x:Name="ProviderWidthBox"
-                                            Maximum="2000"
-                                            Minimum="10"
-                                            SpinButtonPlacementMode="Compact"
-                                            Value="100" />
-                        </StackPanel>
-                        <StackPanel Spacing="4">
-                            <TextBlock FontSize="12"
-                                       Text="Provider Image Height:" />
-                            <muxc:NumberBox x:Name="ProviderHeightBox"
-                                            Maximum="2000"
-                                            Minimum="10"
-                                            SpinButtonPlacementMode="Compact"
-                                            Value="100" />
-                        </StackPanel>
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal"
-                                Spacing="16">
-                        <StackPanel Spacing="4">
-                            <TextBlock FontSize="12"
-                                       Text="Theme MaxWidth:" />
-                            <muxc:NumberBox x:Name="ThemeMaxWidthBox"
-                                            Maximum="2000"
-                                            Minimum="0"
-                                            SpinButtonPlacementMode="Compact"
-                                            Value="500" />
-                        </StackPanel>
-                        <StackPanel Spacing="4">
-                            <TextBlock FontSize="12"
-                                       Text="Theme MaxHeight:" />
-                            <muxc:NumberBox x:Name="ThemeMaxHeightBox"
-                                            Maximum="2000"
-                                            Minimum="0"
-                                            SpinButtonPlacementMode="Compact"
-                                            Value="500" />
-                        </StackPanel>
-                    </StackPanel>
-
-                    <Button x:Name="ApplyButton"
-                            Click="ApplyButton_Click"
-                            Content="Apply and Test" />
-                </StackPanel>
-            </Border>
-
-            <!--  Test Cases  -->
-            <Border Padding="16"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    CornerRadius="8">
-                <StackPanel Spacing="12">
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Test Case 1: Small image, larger theme constraint" />
-                    <TextBlock FontSize="12"
-                               Foreground="{ThemeResource SystemFillColorNeutralBrush}"
-                               TextWrapping="Wrap">
-                        Expected: Image should maintain natural size (100x100), NOT be enlarged to theme constraint (500x500).
-                    </TextBlock>
-                    <controls:MarkdownTextBlock x:Name="TestCase1"
-                                                Text="![test](provider://test1.png)" />
-                    <TextBlock x:Name="TestCase1Result"
-                               FontSize="12" />
-                </StackPanel>
-            </Border>
-
-            <Border Padding="16"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    CornerRadius="8">
-                <StackPanel Spacing="12">
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Test Case 2: Large image (800x600), smaller theme constraint (400)" />
-                    <TextBlock FontSize="12"
-                               Foreground="{ThemeResource SystemFillColorNeutralBrush}"
-                               TextWrapping="Wrap">
-                        Expected: Image should be constrained to theme MaxWidth (400), not remain at 800.
-                    </TextBlock>
-                    <controls:MarkdownTextBlock x:Name="TestCase2"
-                                                Text="![test](provider://test2.png)" />
-                    <TextBlock x:Name="TestCase2Result"
-                               FontSize="12" />
-                </StackPanel>
-            </Border>
-
-            <Border Padding="16"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    CornerRadius="8">
-                <StackPanel Spacing="12">
-                    <TextBlock FontWeight="SemiBold"
-                               Text="Test Case 3: Image with no provider dimensions (unknown natural size)" />
-                    <TextBlock FontSize="12"
-                               Foreground="{ThemeResource SystemFillColorNeutralBrush}"
-                               TextWrapping="Wrap">
-                        Expected: Image should NOT have theme constraints applied (MaxWidth should be Infinity), since we don't know if constraints would enlarge it.
-                    </TextBlock>
-                    <controls:MarkdownTextBlock x:Name="TestCase3"
-                                                Text="![test](provider://test3-nodims.png)" />
-                    <TextBlock x:Name="TestCase3Result"
-                               FontSize="12" />
-                </StackPanel>
-            </Border>
-        </StackPanel>
-    </ScrollViewer>
-</Page>
diff --git a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs b/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
deleted file mode 100644
index 038a38897..000000000
--- a/components/MarkdownTextBlock/samples/MarkdownTextBlockImageProviderSample.xaml.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-// 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.
-
-using CommunityToolkit.WinUI.Controls;
-using Windows.Storage.Streams;
-
-#if WINAPPSDK
-using Microsoft.UI.Xaml.Media.Imaging;
-using Colors = Microsoft.UI.Colors;
-#elif WINDOWS_UWP
-using Windows.UI.Xaml.Media.Imaging;
-using Colors = Windows.UI.Colors;
-#endif
-
-
-namespace MarkdownTextBlockExperiment.Samples;
-
-/// <summary>
-/// Sample demonstrating IImageProvider constraint behavior for manual testing.
-/// This helps verify the fix for: https://github.com/CommunityToolkit/Labs-Windows/pull/771
-/// 
-/// Bug description:
-/// When using IImageProvider, if natural dimensions weren't set on the image, 
-/// theme constraints would incorrectly be applied, potentially enlarging small images.
-/// </summary>
-[ToolkitSample(id: nameof(MarkdownTextBlockImageProviderSample), "Image Provider Constraints", 
-    description: "Manual test for IImageProvider constraint behavior - verifies small images aren't enlarged")]
-public sealed partial class MarkdownTextBlockImageProviderSample : Page
-{
-    public MarkdownTextBlockImageProviderSample()
-    {
-        this.InitializeComponent();
-        this.Loaded += OnLoaded;
-    }
-
-    private async void OnLoaded(object sender, RoutedEventArgs e)
-    {
-        await ApplyConfigurationAsync();
-    }
-
-    private async void ApplyButton_Click(object sender, RoutedEventArgs e)
-    {
-        await ApplyConfigurationAsync();
-    }
-
-    private async Task ApplyConfigurationAsync()
-    {
-        var providerWidth = ProviderWidthBox.Value;
-        var providerHeight = ProviderHeightBox.Value;
-        var themeMaxWidth = ThemeMaxWidthBox.Value;
-        var themeMaxHeight = ThemeMaxHeightBox.Value;
-
-        // Test Case 1: Small image with larger theme constraint
-        // The image should NOT be enlarged
-        var provider1 = new TestImageProvider(providerWidth, providerHeight);
-        var config1 = new MarkdownConfig
-        {
-            ImageProvider = provider1,
-            Themes = new MarkdownThemes
-            {
-                ImageMaxWidth = themeMaxWidth,
-                ImageMaxHeight = themeMaxHeight
-            }
-        };
-        TestCase1.Config = config1;
-        TestCase1.Text = "";
-        TestCase1.Text = "![test](provider://test1.png)";
-
-        // Test Case 2: Large image with smaller theme constraint
-        // The image SHOULD be constrained
-        var provider2 = new TestImageProvider(800, 600);
-        var config2 = new MarkdownConfig
-        {
-            ImageProvider = provider2,
-            Themes = new MarkdownThemes
-            {
-                ImageMaxWidth = 400,
-                ImageMaxHeight = 400
-            }
-        };
-        TestCase2.Config = config2;
-        TestCase2.Text = "";
-        TestCase2.Text = "![test](provider://test2.png)";
-
-        // Test Case 3: Image with no dimensions from provider
-        // Theme constraints should NOT be applied
-        var provider3 = new TestImageProvider(0, 0);
-        var config3 = new MarkdownConfig
-        {
-            ImageProvider = provider3,
-            Themes = new MarkdownThemes
-            {
-                ImageMaxWidth = themeMaxWidth,
-                ImageMaxHeight = themeMaxHeight
-            }
-        };
-        TestCase3.Config = config3;
-        TestCase3.Text = "";
-        TestCase3.Text = "![test](provider://test3-nodims.png)";
-
-        // Give time for images to load, then check results
-
-        await Task.Delay(1000);
-        UpdateResults();
-    }
-
-    private void UpdateResults()
-    {
-        var image1 = FindImage(TestCase1);
-        var image2 = FindImage(TestCase2);
-        var image3 = FindImage(TestCase3);
-
-        var providerWidth = ProviderWidthBox.Value;
-        var themeMaxWidth = ThemeMaxWidthBox.Value;
-
-        // Test Case 1: Small image should stay small
-        if (image1 != null)
-        {
-            var pass = Math.Abs(image1.MaxWidth - providerWidth) < 1;
-            TestCase1Result.Text = $"MaxWidth: {image1.MaxWidth:F0} (Expected: {providerWidth}) - {(pass ? "✅ PASS" : "❌ FAIL - Image incorrectly enlarged!")}";
-            TestCase1Result.Foreground = new SolidColorBrush(pass ? Colors.Green : Colors.Red);
-        }
-        else
-        {
-            TestCase1Result.Text = "❌ Image not found";
-            TestCase1Result.Foreground = new SolidColorBrush(Colors.Red);
-        }
-
-        // Test Case 2: Large image should be constrained to 400
-        if (image2 != null)
-        {
-            var pass = Math.Abs(image2.MaxWidth - 400) < 1;
-            TestCase2Result.Text = $"MaxWidth: {image2.MaxWidth:F0} (Expected: 400) - {(pass ? "✅ PASS" : "❌ FAIL")}";
-            TestCase2Result.Foreground = new SolidColorBrush(pass ? Colors.Green : Colors.Red);
-        }
-        else
-        {
-            TestCase2Result.Text = "❌ Image not found";
-            TestCase2Result.Foreground = new SolidColorBrush(Colors.Red);
-        }
-
-        // Test Case 3: No dimensions - theme should NOT be applied
-        if (image3 != null)
-        {
-            var pass = double.IsInfinity(image3.MaxWidth);
-            TestCase3Result.Text = $"MaxWidth: {image3.MaxWidth} (Expected: Infinity) - {(pass ? "✅ PASS" : "❌ FAIL - Theme incorrectly applied!")}";
-            TestCase3Result.Foreground = new SolidColorBrush(pass ? Colors.Green : Colors.Red);
-        }
-        else
-        {
-            TestCase3Result.Text = "❌ Image not found";
-            TestCase3Result.Foreground = new SolidColorBrush(Colors.Red);
-        }
-    }
-
-    private Image? FindImage(MarkdownTextBlock markdown)
-    {
-        return FindDescendant<Image>(markdown);
-    }
-
-    private T? FindDescendant<T>(DependencyObject parent) where T : DependencyObject
-    {
-        var count = VisualTreeHelper.GetChildrenCount(parent);
-        for (int i = 0; i < count; i++)
-        {
-            var child = VisualTreeHelper.GetChild(parent, i);
-            if (child is T result)
-                return result;
-            var descendant = FindDescendant<T>(child);
-            if (descendant != null)
-                return descendant;
-        }
-        return null;
-    }
-
-    /// <summary>
-    /// Test image provider that downloads a real image but reports configurable dimensions.
-    /// This simulates providers that know the image size vs those that don't.
-    /// </summary>
-    private class TestImageProvider : IImageProvider
-    {
-        private static readonly System.Net.Http.HttpClient s_httpClient = new();
-
-        private readonly double _width;
-        private readonly double _height;
-        private readonly string _realImageUrl;
-
-        // Use a small, fast-loading image
-        private const string DefaultImageUrl = "https://devblogs.microsoft.com/commandline/wp-content/uploads/sites/33/2025/09/ShortcutConflict.png";
-
-        public TestImageProvider(double width, double height, string? realImageUrl = null)
-        {
-            _width = width;
-            _height = height;
-            _realImageUrl = realImageUrl ?? DefaultImageUrl;
-        }
-
-        public bool ShouldUseThisProvider(string url) => url.Contains("provider://");
-
-        public async Task<Image> GetImage(string url)
-        {
-            var image = new Image();
-
-            // Load a real image so it's visible
-            try
-            {
-                var data = await s_httpClient.GetByteArrayAsync(_realImageUrl);
-                var bitmap = new BitmapImage();
-                using (var stream = new InMemoryRandomAccessStream())
-                {
-                    await stream.WriteAsync(data.AsBuffer());
-                    stream.Seek(0);
-                    await bitmap.SetSourceAsync(stream);
-                }
-                image.Source = bitmap;
-            }
-            catch
-            {
-                // Fallback to empty bitmap if download fails
-                image.Source = new BitmapImage();
-            }
-
-            // Only set dimensions if they're valid
-            // This simulates providers that may or may not know the image size
-            if (_width > 0)
-            {
-                image.Width = _width;
-            }
-            if (_height > 0)
-            {
-                image.Height = _height;
-            }
-
-            return image;
-        }
-    }
-}