feat(blazor): move Icon to core descriptor, make it string

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

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/src/Sitko.Blockly.Blazor/BlazorBlockDescriptor.cs b/src/Sitko.Blockly.Blazor/BlazorBlockDescriptor.cs
@@ -17,7 +17,6 @@ protected BlazorBlockDescriptor(ILocalizationProvider<TBlock> localizationProvid
  {
  }
 
- public abstract RenderFragment Icon { get; }
  public virtual Type FormComponent => typeof(TFormComponent);
  public virtual Type DisplayComponent => typeof(TDisplayComponent);
 }
diff --git a/src/Sitko.Blockly.Blazor/IBlazorBlockDescriptor.cs b/src/Sitko.Blockly.Blazor/IBlazorBlockDescriptor.cs
@@ -8,7 +8,6 @@ public interface IBlazorBlockDescriptor : IBlockDescriptor
 {
  string DisplayComponentCssClass => "";
  string FormComponentCssClass => "";
- RenderFragment Icon { get; }
  Type FormComponent { get; }
  Type DisplayComponent { get; }
 }

diff --git a/src/Sitko.Blockly/BlockDescriptor.cs b/src/Sitko.Blockly/BlockDescriptor.cs
@@ -7,6 +7,7 @@ public interface IBlockDescriptor
  string Title { get; }
  Type Type { get; }
  string Key { get; }
+ string Icon { get; }
 }
 
 // ReSharper disable once UnusedTypeParameter
@@ -19,6 +20,7 @@ public abstract record BlockDescriptor : IBlockDescriptor
  public abstract string Title { get; }
  public abstract Type Type { get; }
  public abstract string Key { get; }
+ public abstract string Icon { get; }
 }
 
 public abstract record BlockDescriptor<TBlock> : BlockDescriptor, IBlockDescriptor<TBlock>
@@ -33,4 +35,5 @@ public BlockDescriptor(ILocalizationProvider<TBlock> localizationProvider) =>
 
  public override string Title => LocalizationProvider[typeof(TBlock).Name];
  public override string Key => typeof(TBlock).Name.Replace("Block", "").ToLowerInvariant();
+ public override string Icon => "";
 }
diff --git a/src/Sitko.Blockly/Blocks/CutBlock.cs b/src/Sitko.Blockly/Blocks/CutBlock.cs
@@ -13,8 +13,8 @@ public record CutBlock : ContentBlock
  public override bool ShouldRender(BlocklyListOptions listOptions) =>
  listOptions.Mode == BlocksListMode.Preview;
 
- public override bool ShouldRenderNext(BlocklyListOptions options) =>
- options.Mode == BlocksListMode.Full;
+ public override bool ShouldRenderNext(BlocklyListOptions listOptions) =>
+ listOptions.Mode == BlocksListMode.Full;
 }
 
 public record CutBlockDescriptor : BlockDescriptor<CutBlock>

diff --git a/src/Sitko.Blockly/ContentBlockMetadata.cs b/src/Sitko.Blockly/ContentBlockMetadata.cs
@@ -22,6 +22,7 @@ public ContentBlockMetadata(Type blockType, int priority = int.MaxValue, int max
  public Type BlockType { get; }
 }
 
+[AttributeUsage(AttributeTargets.Class)]
 public class ContentBlockMetadataAttribute : Attribute
 {
  public ContentBlockMetadataAttribute(int priority = int.MaxValue, int maxCount = 0)