Skip to content
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

Allow a parent session to be explicitly passed to Base.show(...) #254

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow a parent session to be explicitly passed to Base.show(...) #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b8c1fe
Allow a parent session to be explicitly passed to Base.show(...)
frankier Sep 22, 2024
2047826
Add show_html(...) for passing keywords
frankier Oct 19, 2024
fa362b2
Export show_html from Bonito.jl
frankier Oct 19, 2024
1b85c85
Merge branch 'master' into session-integration
frankier Oct 19, 2024
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
63 changes: 63 additions & 0 deletions examples/subsession_integration.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
using HTTP
using Bonito: App, Styles, Observable
using Bonito.DOM
using Random
using Colors
using Base.Threads: @spawn
using Dates: Dates


function html(app; kwargs...)
io = IOBuffer()
show_html(io, app; kwargs...)
take!(io)
end

function main()
# start a blocking server
session_root_storage = Dict()
rng = Random.default_rng()
HTTP.listen() do http::HTTP.Stream
HTTP.setstatus(http, 200)
HTTP.startwrite(http)
req_uri = HTTP.URI(http.message.target)
if req_uri.path == "/fragment"
params = HTTP.queryparams(req_uri)
sid = params["sid"]
session = session_root_storage[params["sid"]]
color = rand(RGB{Float64})
css = Styles(
"background-color" => color,
)
app = App() do
date_obs::Observable{String} = Observable("unset")
@async begin
while true
date_obs[] = string(Dates.now())
sleep(1)
end
end
DOM.div(map(date -> "date: $(date); sid: $(sid)", date_obs), style=css)
end
app_html = html(app; parent=session)
write(http, app_html)
else
root_app = App(_ -> DOM.div(""))
app_html = html(root_app)
session = root_app.session[]
session_root_storage[session.id] = session
write(http, "<html><body>")
write(http, "<script src=\"https://unpkg.com/[email protected]\"></script>")
write(http, "<h1>fragment insertion</h1>")
write(http, "<button hx-get=\"/fragment?sid=$(session.id)\" hx-target=\"#results\">Click Me</button>")
write(http, "<div id=\"results\">")
write(http, app_html)
write(http, "</div>")
write(http, "</body></html>")
end
end
end

if abspath(PROGRAM_FILE) == @__FILE__
main()
end
2 changes: 1 addition & 1 deletion src/Bonito.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ include("interactive.jl")
# Core functionality
export Page, Session, App, DOM, SVG, @js_str, ES6Module, Asset, CSS
export Slider, Button, TextField, NumberInput, Checkbox, RangeSlider, CodeEditor
export browser_display, configure_server!, Server, html, route!, online_url, use_electron_display
export browser_display, configure_server!, Server, show_html, html, route!, online_url, use_electron_display
export Observable, on, onany, bind_global
export linkjs, evaljs, evaljs_value, onjs
export NoServer, AssetFolder, HTTPAssetServer, DocumenterAssets
Expand Down
9 changes: 6 additions & 3 deletions src/display.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,11 @@ end
get_io_context(io::IO) = nothing
get_io_context(io::IOContext) = io

function Base.show(io::IO, ::Union{MIME"text/html", MIME"application/prs.juno.plotpane+html"}, app::App)
function show_html(io::IO, app::App; parent=CURRENT_SESSION[])
ctx = get_io_context(io)
session = nothing
if !isnothing(CURRENT_SESSION[])
if !isnothing(parent)
# We render in a subsession
parent = CURRENT_SESSION[]
sub = Session(parent; title=app.title)
sub.io_context[] = ctx
dom = session_dom(sub, app)
Expand Down Expand Up @@ -93,6 +92,10 @@ function Base.show(io::IO, ::Union{MIME"text/html", MIME"application/prs.juno.pl
return sub
end

function Base.show(io::IO, ::Union{MIME"text/html", MIME"application/prs.juno.plotpane+html"}, app::App)
show_html(io, app)
end

function print_as_page(io::IO, dom::Node)
println(io, "<!doctype html>")
# use Hyperscript directly to avoid the additional Bonito attributes
Expand Down
Loading