feat(antdesign): use new string icons

Refs: BLOCKLY-T-2
sitkoru · Jan 19, 2022 · 0092c2d · 0092c2d
1 parent 9b16f52
commit 0092c2d
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 13 deletions.
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntCutBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntCutBlockDescriptor.cs
@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Components;
-using Sitko.Blockly.AntDesignComponents.Display.Blocks;
+using Sitko.Blockly.AntDesignComponents.Display.Blocks;
 using Sitko.Blockly.AntDesignComponents.Forms.Blocks;
 using Sitko.Blockly.Blazor;
 using Sitko.Blockly.Blocks;
@@ -13,5 +12,5 @@ public AntCutBlockDescriptor(ILocalizationProvider<CutBlock> localizationProvide
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("cut");
+    public override string Icon => "cut";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntFilesBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntFilesBlockDescriptor.cs
@@ -14,5 +14,5 @@ public AntFilesBlockDescriptor(ILocalizationProvider<FilesBlock> localizationPro
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("attach");
+    public override string Icon => "attach";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntGalleryBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntGalleryBlockDescriptor.cs
@@ -15,5 +15,5 @@ public AntGalleryBlockDescriptor(ILocalizationProvider<GalleryBlock> localizatio
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("gallery");
+    public override string Icon => "gallery";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntIframeBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntIframeBlockDescriptor.cs
@@ -15,5 +15,5 @@ public AntIframeBlockDescriptor(ILocalizationProvider<IframeBlock> localizationP
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("embed");
+    public override string Icon => "embed";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntQuoteBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntQuoteBlockDescriptor.cs
@@ -14,5 +14,5 @@ public AntQuoteBlockDescriptor(ILocalizationProvider<QuoteBlock> localizationPro
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("quote");
+    public override string Icon => "quote";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntTextBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntTextBlockDescriptor.cs
@@ -14,5 +14,5 @@ public AntTextBlockDescriptor(ILocalizationProvider<TextBlock> localizationProvi
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("text");
+    public override string Icon => "text";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntTwitchBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntTwitchBlockDescriptor.cs
@@ -15,5 +15,5 @@ public AntTwitchBlockDescriptor(ILocalizationProvider<TwitchBlock> localizationP
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("twitch");
+    public override string Icon => "twitch";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntTwitterBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntTwitterBlockDescriptor.cs
@@ -15,5 +15,5 @@ public AntTwitterBlockDescriptor(ILocalizationProvider<TwitterBlock> localizatio
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("twitter");
+    public override string Icon => "twitter";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Blocks/AntYoutubeBlockDescriptor.cs b/src/Sitko.Blockly.AntDesign/Blocks/AntYoutubeBlockDescriptor.cs
@@ -15,5 +15,5 @@ public AntYoutubeBlockDescriptor(ILocalizationProvider<YoutubeBlock> localizatio
     {
     }
 
-    public override RenderFragment Icon => builder => builder.AddIcon("youtube");
+    public override string Icon => "youtube";
 }
diff --git a/src/Sitko.Blockly.AntDesign/Forms/AntBlocklyForm.razor b/src/Sitko.Blockly.AntDesign/Forms/AntBlocklyForm.razor
@@ -21,7 +21,7 @@
                     </div>
                     <div class="block-controls block-controls-default">
                         <div class="block-mainicon" title="@blockDescriptor.Title">
-                            @blockDescriptor.Icon
+                            <CustomAntIcon Icon="@blockDescriptor.Icon"></CustomAntIcon>
                         </div>
                         <span title="@(block.Enabled ? LocalizationProvider["Disable block"] : LocalizationProvider["Enable block"])">
                             <AntDesign.Button Size="Default" OnClick="@(() => block.Enabled = !block.Enabled)" Class="block-disable-button">
@@ -77,7 +77,7 @@
                            foreach (var descriptor in BlockDescriptors)
                            {
                                <span class="add-block-button" title="@descriptor.Title">
-                                   <AntDesign.Button Disabled="!CanAdd(descriptor)" Size="@AntSizeLDSType.Default" OnClick="() => AddBlock(descriptor, afterBlock)">@descriptor.Icon</AntDesign.Button>
+                                   <AntDesign.Button Disabled="!CanAdd(descriptor)" Size="@AntSizeLDSType.Default" OnClick="() => AddBlock(descriptor, afterBlock)"><CustomAntIcon Icon="@descriptor.Icon"></CustomAntIcon></AntDesign.Button>
                                </span>
                            }
                        }

diff --git a/src/Sitko.Blockly.AntDesign/Icons/CustomAntIcon.razor b/src/Sitko.Blockly.AntDesign/Icons/CustomAntIcon.razor
@@ -0,0 +1,15 @@
+@if (!string.IsNullOrEmpty(Icon))
+{
+    <Icon>
+        <Component>
+            @CustomIconsProvider.GetIcon(Icon)
+        </Component>
+    </Icon>
+}
+
+@code {
+
+    [Parameter]
+    public string Icon { get; set; } = "";
+
+}
diff --git a/src/Sitko.Blockly.AntDesign/_Imports.razor b/src/Sitko.Blockly.AntDesign/_Imports.razor
@@ -11,4 +11,5 @@
 @using Sitko.Blockly.Blazor.Forms.Blocks
 @using Sitko.Blockly.Blazor.Display
 @using Sitko.Blockly.Blazor.Display.Blocks
+@using Sitko.Blockly.AntDesignComponents.Icons
 @using Sitko.Blazor.CKEditor
-Original file line number
+Diff line change
@@ Expand Up @@
         {
         }
-        public override RenderFragment Icon => builder => builder.AddIcon("attach");
+        public override string Icon => "attach";
     }