fix display in Jupyter

Author: joshday

.gitignore

@@ -12,3 +12,6 @@ Manifest.toml
 *.tar.gz
 deps/temp*
 notebooks/
+*.ipynb
+*.html
+docs/demo_files

README.md

@@ -109,7 +109,7 @@ PlotlyKaleido.savefig(p, "myplot.png")
 
 # ⚙️ Defaults
 
-A common workflow is to create multiple plots with a similar style.  Rather then setting nearly identical layouts for multiple plots, you can set default values for a variety of items.  HTML defaults (`class`/`style`/`parent_class`/`parent_style`) are chosen to make the plot reactive to the browser window size.
+You can set default values for the `layout`, `config`, and a number of other options that affect how the plot displays in your browser.  HTML defaults (`class`/`style`/`parent_class`/`parent_style`) are chosen to make the plot reactive to the browser window size.
 
 ```julia
 module Defaults
@@ -133,10 +133,10 @@ end
 </div>
 ```
 
-- Default values can be set e.g.
+- Default values are `Ref`s and can be changed e.g.
 
 ```julia
-PlotlyLight.Defaults.layout[].title="Default Title"
+PlotlyLight.Defaults.layout[].title.text = "Default Title"
 ```
 
 - Revert back to the original defaults with `Defaults.reset!()`

src/PlotlyLight.jl

@@ -47,12 +47,6 @@ end
 end # Defaults module
 
 #-----------------------------------------------------------------------------# src!
-struct CDN
-    url::String
-    CDN(url="https://cdn.plot.ly/$version.min.js") = new(url)
-end
-
-
 src_opts = [:cdn, :local, :standalone, :none]
 """
     src!(x::Symbol) # `x` must be one of: $src_opts
@@ -137,23 +131,23 @@ Base.display(::Cobweb.CobwebDisplay, o::Plot) = display(Cobweb.CobwebDisplay(),
 
 Base.show(io::IO, ::MIME"juliavscode/html", o::Plot) = show(io, MIME"text/html"(), o)
 
-function Base.show(io::IO, M::MIME"text/html", o::Plot)
+function write_plot_div(io::IO, o::Plot)
     class, style = Defaults.class, Defaults.style
     parent_class, parent_style = Defaults.parent_class, Defaults.parent_style
-    parent_style = if get(io, :is_pluto, false)
-        s = replace(parent_style[], r"height.*;" => "")
-        "height: 400px;" * s
-    else
+    parent_style = get(io, :is_pluto, false) || get(io, :jupyter, false) ?
+        "height:400px;" * parent_style[] :
         parent_style[]
-    end
-    src = Defaults.src[]
-    src in [:cdn, :standalone, :none, :local] || error("`src` must be :cdn, :standalone, :none, or :local")
     println(io, "<div class=\"", parent_class[], "\" style=\"", parent_style, "\" id=\"", "parent-of-", o.id, "\">")
     println(io, "    <div class=\"", class[], "\" style=\"", style[], "\" id=\"", o.id, "\"></div>")
     println(io, "</div>")
+end
+
+function write_load_plotly(io)
+    src = Defaults.src[]
+    src in [:cdn, :standalone, :none, :local] || error("`src` must be :cdn, :standalone, :none, or :local")
 
     if src === :cdn
-        println(io, "<script src=$(repr(cdn_url))></script>")
+        println(io, "<script src=", repr(cdn_url), "></script>")
     elseif src === :standalone
         print(io, "<script>")
         for line in eachline(plotlyjs)
@@ -162,20 +156,56 @@ function Base.show(io::IO, M::MIME"text/html", o::Plot)
         println(io, "</script>")
     elseif src === :local
         println(io, "<script src=\"", plotlyjs, "\"></script>")
-    else
-        # :none
     end
+end
 
-    println(io, "<script>")
+function write_newplot(io::IO, o::Plot)
     print(io, "Plotly.newPlot(\"", o.id, "\", ")
     JSON3.write(io, o.data)
     print(io, ", ")
     JSON3.write(io, o.layout)
     print(io, ", ")
     JSON3.write(io, o.config)
     println(io, ");")
-    show(io, MIME"text/javascript"(), o.js)
-    print(io, "</script>\n")
+end
+
+function write_require_config(io)
+    write(io, """
+    <script type="text/javascript">
+        if (typeof require !== 'undefined') {
+            require.undef("plotly");
+            requirejs.config({
+                paths: {
+                    'plotly': '$(cdn_url[7:end-3])'
+                }
+            });
+            require(['plotly'], function(Plotly) {
+                window._Plotly = Plotly;
+            });
+        }
+    </script>
+    """)
+end
+
+function Base.show(io::IO, M::MIME"text/html", o::Plot)
+    write_plot_div(io, o)
+
+    if :jupyter in keys(io)
+        write_require_config(io)
+        println(io, "<script>")
+        write(io, "require([\"plotly\"], function(Plotly) {\n")
+        write_newplot(io, o)
+        show(io, MIME"text/javascript"(), o.js)
+        write(io, "});")
+        println(io, "</script>")
+    else
+        # write_plot_div(io, o)
+        write_load_plotly(io)
+        println(io, "<script>")
+        write_newplot(io, o)
+        show(io, MIME"text/javascript"(), o.js)
+        print(io, "</script>\n")
+    end
 end
 
 #-----------------------------------------------------------------------------# vecvec