🖱 Right click to save SVG

Project.toml

@@ -2,7 +2,7 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <[email protected]>", "Mikołaj Bochenski <[email protected]>"]
-version = "0.11.2"
+version = "0.11.3"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

frontend/components/Cell.js

@@ -42,7 +42,7 @@ export const empty_cell_data = (cell_id) => {
         local_code: {
             body: "",
         },
-        code_folded: true,
+        code_folded: false,
         running: true,
         runtime: null,
         errored: false,

frontend/components/CellInput.js

@@ -139,7 +139,7 @@ export const CellInput = ({
     // if the CodeMirror initialized/changed while it was hidden, and it suddely became unhidden, we need to refresh it to fix a layout bug where the gutter takes no horizontal space.
     useLayoutEffect(() => {
         if (!is_hidden) {
-            cm_ref.current.refresh()
+            cm_ref.current && cm_ref.current.refresh()
         }
     }, [is_hidden])
 

frontend/components/CellOutput.js

@@ -59,10 +59,10 @@ const OutputBody = ({ mime, body, cell_id, all_completed_promise, requests }) =>
         case "image/jpg":
         case "image/gif":
         case "image/bmp":
+        case "image/svg+xml":
             return html`<div><img src=${body} /></div>`
             break
         case "text/html":
-        case "image/svg+xml": // TODO: don't run scripts here
         case "application/vnd.pluto.tree+xml":
             return html`<${RawHTMLContainer} body=${body} all_completed_promise=${all_completed_promise} requests=${requests} />`
             break

frontend/components/Editor.js

@@ -227,6 +227,7 @@ export class Editor extends Component {
                                 cells: update.message.cells.map((cell) => {
                                     const cell_data = empty_cell_data(cell.cell_id)
                                     cell_data.running = run_all
+                                    cell_data.code_folded = true
                                     return cell_data
                                 }),
                             },

frontend/components/RunArea.js

@@ -3,8 +3,8 @@ import { html } from "../common/Preact.js"
 export const RunArea = ({ runtime, onClick }) => {
     return html`
         <pluto-runarea>
-            <span class="runtime">${prettytime(runtime)}</span>
             <button onClick=${onClick} class="runcell" title="Run"><span></span></button>
+            <span class="runtime">${prettytime(runtime)}</span>
         </pluto-runarea>
     `
 }

src/runner/PlutoRunner.jl

@@ -288,7 +288,39 @@ function show_richest(io::IO, @nospecialize(x); onlyhtml::Bool=false)::MIME
         return MIME"application/vnd.pluto.tree+xml"()
     end
 
-    if istextmime(mime)
+    if mime ∈ imagemimes
+        if mime isa MIME"image/svg+xml"            
+            if onlyhtml
+                print(io, "<img src=\"data:", mime, ",")
+                htmlesc(io, repr(mime, x; context=io))
+                print(io, "\">")
+                return MIME"text/html"()
+            else
+                print(io, "data:", mime, ",")
+                show(io, mime, x)
+                return mime
+            end
+        else
+            # svg is a text mime, all other imagy MIMEs are "raw" mimes: show returns a UInt8[]
+            # so we base64 encode the result
+
+            enc_pipe = Base64.Base64EncodePipe(io)
+            io_64 = IOContext(enc_pipe, iocontext)
+
+            if onlyhtml
+                print(io, "<img src=\"data:", mime, ";base64,")
+                show(io_64, mime, x)
+                close(enc_pipe)
+                print(io, "\">")
+                return MIME"text/html"()
+            else
+                print(io, "data:", mime, ";base64,")
+                show(io_64, mime, x)
+                close(enc_pipe)
+                return mime
+            end
+        end
+    else
         if onlyhtml || mime isa MIME"text/latex"
             # see onlyhtml description in docstring
             if mime isa MIME"text/plain"
@@ -309,23 +341,6 @@ function show_richest(io::IO, @nospecialize(x); onlyhtml::Bool=false)::MIME
             show(io, mime, x)
             return mime
         end
-    else
-        # these are the "raw" MIME types
-        # they happen to all be imagy MIMEs
-        enc_pipe = Base64.Base64EncodePipe(io)
-        io_64 = IOContext(enc_pipe, iocontext)
-        if onlyhtml
-            print(io, "<img src=\"data:", mime, ";base64,")
-            show(io_64, mime, x)
-            close(enc_pipe)
-            print(io, "\">")
-            return MIME"text/html"()
-        else
-            print(io, "data:", mime, ";base64,")
-            show(io_64, mime, x)
-            close(enc_pipe)
-            return mime
-        end
     end
 end