Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions src/App.fs
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
module App
module Root

open Feliz
open Browser.Dom
open Fable.Core.JsInterop


importSideEffects "./index.css"


let root = ReactDOM.createRoot(document.getElementById "root")
root.render(App.Components.Counter())
root.render(App.Main.El())
5 changes: 3 additions & 2 deletions src/App.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="Components.fs" />
<Compile Include="Components.test.fs" />
<Compile Include="components/Counter.fs" />
<Compile Include="Main.fs" />
<Compile Include="Main.test.fs" />
<Compile Include="App.fs" />
</ItemGroup>

Expand Down
22 changes: 4 additions & 18 deletions src/Components.fs → src/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ open Feliz
open Fable.Core
open Fable.Core.JsInterop

type Components() =
module Main =

[<ReactComponent>]
static member Counter() =
let (count, setCount) = React.useState(0)

let El() =

let viteLogo: unit -> unit = import "default" "./assets/vite.svg"
let reactLogo: unit -> unit = import "default" "./assets/react.svg"
importSideEffects "./App.css"
Expand Down Expand Up @@ -51,20 +50,7 @@ type Components() =
]
]
Html.h1 "Vite + React + Feliz"
Html.div [
prop.className "card"
prop.children [
Html.button [
prop.onClick (fun _ -> setCount(count + 1))
prop.text $"count is {count}"
]
Html.p [
Html.text "Edit "
Html.code "src/App.fs"
Html.text " and save to test HMR"
]
]
]
Components.Counter.El()
Html.p [
prop.className "read-the-docs"
prop.text " Click on the Vite, React or Fable Vite Plugin logos to learn more"
Expand Down
2 changes: 1 addition & 1 deletion src/Components.test.fs → src/Main.test.fs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ open Fable.Jester
open App

Jest.describe("Counter component", fun () ->
let element = RTL.render(Components.Counter())
let element = RTL.render(App.Main.El())

Jest.test("should render initial count", fun () ->
let countElement = element.getByText("count is 0")
Expand Down
24 changes: 24 additions & 0 deletions src/components/Counter.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module App.Components.Counter

open Feliz

[<ReactComponent>]
let El() =
let (count, setCount) = React.useState(0)

Html.div [
prop.className "card"
prop.children [
Html.h2 "Counter.fs Yes"
Html.button [
prop.onClick (fun _ -> setCount(count + 1))
prop.text $"count is {count}"
]
Html.p [
Html.text "Edit "
Html.code "src/App.fs"
Html.text " and save to test HMR yes"
]
]
]