Feliz.Markdown v2.4.0 fixes ICodeProperties and adds markdown.compone…

…nts.pre
Zaid-Ajaj · Jan 14, 2023 · 684c300 · EverybodyKurts · Feb 5, 2024 · 684c300
1 parent 582f4fb
commit 684c300
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/Feliz.Markdown/Feliz.Markdown.fsproj b/Feliz.Markdown/Feliz.Markdown.fsproj
@@ -4,7 +4,7 @@
         <PackageIconUrl></PackageIconUrl>
         <PackageTags>fsharp;fable;react;html</PackageTags>
         <Authors>Zaid Ajaj</Authors>
-        <Version>2.3.0</Version>
+        <Version>2.4.0</Version>
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
     <PropertyGroup>
@@ -20,6 +20,6 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Update="FSharp.Core" Version="4.7.2" />
-        <PackageReference Include="Feliz" Version="2.3.0" />
+        <PackageReference Include="Feliz" Version="2.4.0" />
     </ItemGroup>
 </Project>
diff --git a/Feliz.Markdown/Markdown.fs b/Feliz.Markdown/Markdown.fs
@@ -7,8 +7,9 @@ open Feliz
 type IMarkdownRenderer = interface end
 
 type ICodeProperties =
-    abstract language : string
-    abstract value : string
+    abstract isInline : bool
+    abstract className : string
+    abstract children: ReactElement []
 
 type ITextProperties =
     abstract children: string
@@ -49,6 +50,9 @@ type IListItemProperties =
 type IPluginsProperties =
     abstract children: ReactElement []
 
+type IPreProperties = 
+    abstract children: ReactElement []
+
 type IComponent = interface end
 
 [<Erase>]
@@ -76,7 +80,16 @@ module markdown =
         static member inline ol(render: IListProperties -> ReactElement) = unbox<IComponent> (Interop.mkAttr "ol" render)
         static member inline ul(render: IListProperties -> ReactElement) = unbox<IComponent> (Interop.mkAttr "ul" render)
         static member inline li(render: IListProperties -> ReactElement) = unbox<IComponent> (Interop.mkAttr "li" render)
-        static member inline code(render: ICodeProperties -> ReactElement) = unbox<IComponent> (Interop.mkAttr "code" render)
+        static member inline code(render: ICodeProperties -> ReactElement) = 
+            let renderInternal (props: obj) = 
+                let inputs = createObj [
+                    "className" ==> emitJsExpr<string> props "$0.className || \"\""
+                    "children" ==> emitJsExpr<ReactElement []> props "$0.children || []"
+                    "isInline" ==> emitJsExpr<bool> props "$0.inline || false"
+                ]
+                render (unbox<ICodeProperties> inputs)
+            unbox<IComponent> (Interop.mkAttr "code" renderInternal)
+        static member inline pre(render: ICodeProperties -> ReactElement) = unbox<IComponent> (Interop.mkAttr "pre" render)
 
 
 type INodeType = interface end