Skip to content

Felizv3 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sydsutton merged 9 commits into from
Apr 8, 2026
Merged

Felizv3 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
803fb12
FS.FluentUI to Felizv3
Sagensagen Apr 5, 2026
e95d1b7
FS.FluentUI.V8toV9 to Felizv3
Sagensagen Apr 5, 2026
e073db5
Bump charts to fable 4.5
Sagensagen Apr 5, 2026
6ff0d2a
TestGrounds to felizV3
Sagensagen Apr 5, 2026
20c5d87
bump fullcalendar to fable.core 4.5
Sagensagen Apr 5, 2026
92993cb
add dotnet-tools.json
Sagensagen Apr 5, 2026
016556d
fable tool to 4.5.0
Sagensagen Apr 5, 2026
48ee596
Use Feliz.HtmlHelper.extractByKeyFast in FuiHelpers.createElement
Sagensagen Apr 5, 2026
9d266dc
Bump to fable 5 prerelease
Sagensagen Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/FS.FluentUI.Charts/FS.FluentUI.Charts.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="6.0.1" />
<PackageReference Include="Fable.Core" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Feliz" Version="2.9.0" />
<PackageReference Include="Feliz" Version="3.2.0" />
</ItemGroup>

<PropertyGroup>
Expand Down
8 changes: 5 additions & 3 deletions src/FS.FluentUI.TestGrounds/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
"isRoot": true,
"tools": {
"fable": {
"version": "4.1.4",
"version": "5.0.0-rc.6",
"commands": [
"fable"
]
],
"rollForward": false
},
"fantomas": {
"version": "6.1.3",
"commands": [
"fantomas"
]
],
"rollForward": false
}
}
}
2 changes: 1 addition & 1 deletion src/FS.FluentUI.TestGrounds/src/TestCharts.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ let TestChartsComponent () =
areaChart.height 300
areaChart.width 600
areaChart.legendsOverflowText "Overflow Items"
areaChart.yAxisTickFormat (fun (s:string) -> $"${s}")
areaChart.yAxisTickFormat (fun (s:string) -> "$" + s)
areaChart.svgProps [ prop.ariaLabel "This is another test?!"]
areaChart.enableGradient true
areaChart.enablePerfOptimization true
Expand Down
2 changes: 1 addition & 1 deletion src/FS.FluentUI.TestGrounds/src/TestGrounds.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2961,7 +2961,7 @@ type ButtonItem = {

[<ReactComponent>]
let RenderButton (button: ButtonItem) (isLastItem: bool) =
React.fragment [
React.Fragment [
Fui.overflowItem [
overflowItem.key (button.key |> string)
overflowItem.priority (if isLastItem then button.key else 0)
Expand Down
6 changes: 4 additions & 2 deletions src/FS.FluentUI.TestGrounds/src/TestGrounds.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Feliz" Version="2.9.0" />
<PackageReference Include="Feliz.UseElmish" Version="2.4.0" />
<PackageReference Include="Fable.Core" Version="4.5.0" />
<PackageReference Include="Feliz" Version="3.2.0" />
<PackageReference Include="Feliz.CompilerPlugins" Version="3.1.0" />
<PackageReference Include="Feliz.UseElmish" Version="2.5.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/FS.FluentUI.TestGrounds/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</head>
<body>
<div id="feliz-app"></div>
<script type="module" src="./Main.fs.js"></script>
<!-- <script type="module" src="./Main.jsx"></script>-->
<!-- <script type="module" src="./Main.fs.js"></script>-->
<script type="module" src="./Main.jsx"></script>
</body>
</html>
3 changes: 2 additions & 1 deletion src/FS.FluentUI.V8toV9/FS.FluentUI.V8toV9.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="6.0.1" />
<PackageReference Include="Fable.Core" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Feliz" Version="2.6.0" />
<PackageReference Include="Feliz" Version="3.2.0" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/FS.FluentUI.V8toV9/FelizProps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ type prop<'Property> =
/// Children of this React element.
static member inline children (value: Fable.React.ReactElement) = Interop.mkProperty<'Property> "children" value
/// Children of this React element.
static member inline children (elems: Fable.React.ReactElement seq) = Interop.mkProperty<'Property> "children" (Interop.reactApi.Children.toArray (Array.ofSeq elems))
static member inline children (elems: Fable.React.ReactElement seq) = Interop.mkProperty<'Property> "children" (Array.ofSeq elems)

/// A URL that designates a source document or message for the information quoted. This attribute is intended to
/// point to information explaining the context or the reference for the quote.
Expand Down
4 changes: 4 additions & 0 deletions src/FS.FluentUI.V8toV9/Utils.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
namespace FS.FluentUI.V8toV9

open Fable.Core
open Fable.Core.JsInterop
open Fable.React

type [<Erase>] IStackProp = interface end
type [<Erase>] IStackItemProp = interface end
Expand All @@ -11,3 +13,5 @@ type [<Erase>] IStackTokens = interface end
[<RequireQualifiedAccess>]
type Interop =
static member inline mkProperty<'ControlProperty> (key:string) (value:obj) : 'ControlProperty = unbox (key, value)
static member inline reactElementWithChildren (el: ReactElementType) (children: #seq<ReactElement>) : ReactElement =
ReactBindings.React.createElement(el, createObj [], children)
9 changes: 6 additions & 3 deletions src/FS.FluentUI/BundleIcons.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ open FS.FluentUI

type [<Erase>] bundleHelper =
static member inline expandImport (value : string) =
let filled = import $"{value}Filled" FluentIcons |> unbox<BundleIcon>
let regular = import $"{value}Regular" FluentIcons |> unbox<BundleIcon>
let icons : obj = importAll FluentIcons
let filled : BundleIcon = emitJsExpr (icons, value) "$0[$1 + 'Filled']"
let regular : BundleIcon = emitJsExpr (icons, value) "$0[$1 + 'Regular']"

{ BundleIcons.Filled = filled; BundleIcons.Regular = regular }

Expand All @@ -28,7 +29,9 @@ type [<Erase>] bundleIcons =
///}
///
/// Fui.bundleIcon customBundleIcons</code></pre>
static member inline import (iconName: string) = import $"{iconName}" FluentIcons |> unbox<BundleIcon>
static member inline import (iconName: string) : BundleIcon =
let icons : obj = importAll FluentIcons
emitJsExpr (icons, iconName) "$0[$1]"
static member inline xray = bundleHelper.expandImport "Xray"
static member inline usbStick = bundleHelper.expandImport "UsbStick"
static member inline usbPlug = bundleHelper.expandImport "UsbPlug"
Expand Down
3 changes: 2 additions & 1 deletion src/FS.FluentUI/FS.FluentUI.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="6.0.1" />
<PackageReference Include="Fable.Core" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Feliz" Version="2.9.0" />
<PackageReference Include="Feliz" Version="3.2.0" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/FS.FluentUI/FelizProps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ type prop<'Property> =
/// Children of this React element.
static member inline children (value: Fable.React.ReactElement) = Interop.mkProperty<'Property> "children" value
/// Children of this React element.
static member inline children (elems: Fable.React.ReactElement seq) = Interop.mkProperty<'Property> "children" (Interop.reactApi.Children.toArray (Array.ofSeq elems))
static member inline children (elems: Fable.React.ReactElement seq) = Interop.mkProperty<'Property> "children" (Array.ofSeq elems)

/// A URL that designates a source document or message for the information quoted. This attribute is intended to
/// point to information explaining the context or the reference for the quote.
Expand Down
Loading