Merge branch 'dev' of https://github.com/plotly/Dash.jl into dev

Author: waralex

Project.toml

@@ -1,7 +1,7 @@
 name = "Dash"
 uuid = "1b08a953-4be3-4667-9a23-3db579824955"
 authors = ["Chris Parmer <[email protected]>", "Alexandr Romanenko <[email protected]>"]
-version = "1.1.1"
+version = "1.1.2"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -17,6 +17,7 @@ JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 MD5 = "6ac74813-4b46-53a4-afec-0b5dc9d7885c"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
+Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

README.md

@@ -25,12 +25,7 @@ pkg> add Dash DashCoreComponents DashHtmlComponents DashTable
 To install the latest (stable) development version instead:
 
 ```julia
-using Pkg
-Pkg.add(PackageSpec(url="https://github.com/plotly/DashBase.jl.git"))
-Pkg.add(PackageSpec(url="https://github.com/plotly/dash-html-components.git", rev="master"))
-Pkg.add(PackageSpec(url="https://github.com/plotly/dash-core-components.git", rev="master"))
-Pkg.add(PackageSpec(url="https://github.com/plotly/dash-table.git", rev="master"))
-Pkg.add(PackageSpec(url="https://github.com/plotly/Dash.jl.git", rev="dev"))
+pkg> add Dash#dev
 ```
 
 ## Usage

src/Dash.jl

@@ -3,6 +3,7 @@ using DashBase
 import HTTP, JSON3, CodecZlib, MD5
 using Sockets
 using Pkg.Artifacts
+using Requires
 
 const ROOT_PATH = realpath(joinpath(@__DIR__, ".."))
 #const RESOURCE_PATH = realpath(joinpath(ROOT_PATH, "resources"))
@@ -107,6 +108,7 @@ const _metadata = load_all_metadata()
 function __init__()
    setup_renderer_resources()
    setup_dash_resources()
+   @require PlotlyJS="f0f68f2c-4968-5e81-91da-67840de0976a" include("plotly_js.jl")
 end
 
 

src/plotly_js.jl

@@ -0,0 +1,8 @@
+import JSON
+
+function DashBase.to_dash(p::PlotlyJS.SyncPlot)
+    data = JSON.lower(p.plot)
+    pop!(data, :config, nothing)
+    return data
+end
+

test/ci_prepare.jl

@@ -3,6 +3,7 @@ Pkg.update()
 Pkg.develop(path = ".")
 Pkg.add("DashBase")
 Pkg.add("PlotlyBase")
+Pkg.add("PlotlyJS")
 Pkg.add("HTTP")
 Pkg.instantiate()
 Pkg.build("Dash")

test/integration/base/jl_plotly_graph/jlpg002_plotlyjs_graph.jl

@@ -0,0 +1,20 @@
+using Dash
+using PlotlyJS
+app = dash()
+app.layout = html_div() do
+    dcc_graph(id = "graph",
+        figure = plot(scatter(x=1:10, y = 1:20))
+    ),
+    html_button("draw", id = "draw"),
+    html_div("", id = "status")
+end
+
+callback!(app, Output("graph", "figure"), Output("status", "children"), Input("draw", "n_clicks")) do nclicks
+    p = isnothing(nclicks) ?
+           no_update() :
+           plot([scatter(x=1:10, y = 1:10), scatter(x=1:10, y = 1:2:20)])
+    status = isnothing(nclicks) ? "first" : "second"
+    return (p, status)
+end
+
+run_server(app)