Add conversion of Plots.jl's plotly plots#4

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

Merged
etpinard merged 5 commits into from
Aug 3, 2023
Merged

Add conversion of Plots.jl's plotly plots #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
274643d
add test workflow
BeastyBlacksmith Jul 28, 2023
278efea
add Plots conversion via extension
BeastyBlacksmith Jul 28, 2023
1a00ca5
add Plots to extras
BeastyBlacksmith Jul 28, 2023
75adf09
add PlotlyBase/PlotlyJS extensions and tests
BeastyBlacksmith Aug 2, 2023
57e2d73
add compats
BeastyBlacksmith Aug 2, 2023
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
20 changes: 20 additions & 0 deletions .github/workflows/jl_test.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: Julia tests

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
jl_version: ["1.6", "1.8", "1.9"]
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.jl_version }}
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
with:
annotate: true
28 changes: 26 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,32 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

[extensions]
DashBasePlotlyBaseExt = "PlotlyBase"
DashBasePlotlyJSExt = "PlotlyJS"
DashBasePlotsExt = "Plots"

[compat]
JSON3 = "1"
julia = "1.2"
Plots = "1"
julia = "1.6"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
PackageExtensionCompat = "1"

[extras]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Plots", "PlotlyBase", "PlotlyJS", "PlotlyKaleido"]
13 changes: 13 additions & 0 deletions ext/DashBasePlotlyBaseExt.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON

@etpinardetpinardAug 2, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would of course break if PlotlyBase stops importing JSON.

I think this here is fine for now, but we should probably make the switch to using JSON3 exclusively inside DashBase.jl and Dash.jl. We should open an issue once this PR is merged.

Looks like PlotlyBase does define JSON3-compatible StructTypes https://github.com/JuliaPlots/PlotlyBase.jl/blob/master/src/json3.jl, but I haven't tested it


function DashBase.to_dash(p::PlotlyBase.Plot)
data = JSON.lower(p)
pop!(data, :config, nothing)
return data
end

end
10 changes: 10 additions & 0 deletions ext/DashBasePlotlyJSExt.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
DashBase.to_dash(p.plot)
end

end
18 changes: 18 additions & 0 deletions ext/DashBasePlotsExt.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
module DashBasePlotsExt

import Plots
import DashBase


function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyBackend})
return if haskey(Base.loaded_modules, Base.PkgId(Base.UUID("a03496cd-edff-5a9b-9e67-9cda94a718b5"), "PlotlyBase")) &&
haskey(Base.loaded_modules, Base.PkgId(Base.UUID("f2990250-8cf9-495f-b13a-cce12b45703c"), "PlotlyKaleido"))
# Note: technically it would be sufficient if PlotlyBase is loaded, but thats how it is currently handled by Plots.jl
Plots.plotlybase_syncplot(p)
else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

end
5 changes: 5 additions & 0 deletions src/DashBase.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -8,4 +9,8 @@ get_dash_dependencies, get_dash_renderer_pkg, get_componens_pkgs,
has_relative_path, has_dev_path, has_external_url, get_type,
get_external_url, get_dev_path, get_relative_path

function __init__()
PackageExtensionCompat.@require_extensions
end

end # module
3 changes: 2 additions & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
using Test
include("components.jl")
include("registry.jl")
include("test_ext.jl")
include("registry.jl")
25 changes: 25 additions & 0 deletions test/test_ext.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
using DashBase
using Test
using Plots
plotlyjs()

@testset "PlotlyJS" begin
pl = @test_nowarn DashBase.to_dash(plot(1:5))
@test pl isa PlotlyJS.SyncPlot
Comment on lines +7 to +8

@BeastyBlacksmithBeastyBlacksmithAug 2, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard do these need to return something readable by JSON3 or is it enough, that they return something that has a to_dash method?

@etpinardetpinardAug 2, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Have you tried it inside a Dash.jl callback?

pl = @test_nowarn DashBase.to_dash(pl)
@test haskey(pl, :layout)
@test haskey(pl, :data)
@test haskey(pl, :frames)
@test !haskey(pl, :config)
end

plotly()
@testset "PlotlyBase" begin
pl = @test_nowarn DashBase.to_dash(plot(1:5))
@test pl isa PlotlyBase.Plot
pl = @test_nowarn DashBase.to_dash(pl)
@test haskey(pl, :layout)
@test haskey(pl, :data)
@test haskey(pl, :frames)
@test !haskey(pl, :config)
end
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add conversion of Plots.jl's plotly plots#4

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

 Merged

etpinard
merged 5 commits into

from

Aug 3, 2023
 Merged


Add conversion of Plots.jl's plotly plots
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
274643d

add test workflow


BeastyBlacksmith Jul 28, 2023
278efea

add Plots conversion via extension


BeastyBlacksmith Jul 28, 2023
1a00ca5

add Plots to extras


BeastyBlacksmith Jul 28, 2023
75adf09

add PlotlyBase/PlotlyJS extensions and tests


BeastyBlacksmith Aug 2, 2023
57e2d73

add compats


BeastyBlacksmith Aug 2, 2023

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


20 changes: 20 additions & 0 deletions
.github/workflows/jl_test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: Julia tests

on: [push, pull_request]

jobs:
 test:
 runs-on: ubuntu-latest
 strategy:
 fail-fast: false
 matrix:
 jl_version: ["1.6", "1.8", "1.9"]
 steps:
 - uses: actions/checkout@v2
 - uses: julia-actions/setup-julia@v1
 with:
 version: ${{ matrix.jl_version }}
 - uses: julia-actions/julia-buildpkg@v1
 - uses: julia-actions/julia-runtest@v1
 with:
 annotate: true

28 changes: 26 additions & 2 deletions
Project.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,32 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

[extensions]
DashBasePlotlyBaseExt = "PlotlyBase"
DashBasePlotlyJSExt = "PlotlyJS"
DashBasePlotsExt = "Plots"

[compat]
JSON3 = "1"
julia = "1.2"
Plots = "1"
julia = "1.6"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
PackageExtensionCompat = "1"

[extras]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Plots", "PlotlyBase", "PlotlyJS", "PlotlyKaleido"]

13 changes: 13 additions & 0 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would of course break if PlotlyBase stops importing JSON.
I think this here is fine for now, but we should probably make the switch to using JSON3 exclusively inside DashBase.jl and Dash.jl. We should open an issue once this PR is merged.
Looks like PlotlyBase does define JSON3-compatible StructTypes https://github.com/JuliaPlots/PlotlyBase.jl/blob/master/src/json3.jl, but I haven't tested it

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
 pop!(data, :config, nothing)
 return data
end

end

10 changes: 10 additions & 0 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
end

end

18 changes: 18 additions & 0 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
module DashBasePlotsExt

import Plots
import DashBase


function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyBackend})
 return if haskey(Base.loaded_modules, Base.PkgId(Base.UUID("a03496cd-edff-5a9b-9e67-9cda94a718b5"), "PlotlyBase")) &&
 haskey(Base.loaded_modules, Base.PkgId(Base.UUID("f2990250-8cf9-495f-b13a-cce12b45703c"), "PlotlyKaleido"))
 # Note: technically it would be sufficient if PlotlyBase is loaded, but thats how it is currently handled by Plots.jl
 Plots.plotlybase_syncplot(p)
 else
 (data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

end

5 changes: 5 additions & 0 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -8,4 +9,8 @@ get_dash_dependencies, get_dash_renderer_pkg, get_componens_pkgs,
has_relative_path, has_dev_path, has_external_url, get_type,
get_external_url, get_dev_path, get_relative_path

function __init__()
 PackageExtensionCompat.@require_extensions
end

end # module

3 changes: 2 additions & 1 deletion
test/runtests.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
using Test
include("components.jl")
include("registry.jl")
include("test_ext.jl")
include("registry.jl")

25 changes: 25 additions & 0 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
using DashBase
using Test
using Plots
plotlyjs()

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot

Comment on lines

+7
 to 
+8

@BeastyBlacksmithBeastyBlacksmithAug 2, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard do these need to return something readable by JSON3 or is it enough, that they return something that has a to_dash method?
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Have you tried it inside a Dash.jl callback?
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

plotly()
@testset "PlotlyBase" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyBase.Plot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add conversion of Plots.jl's plotly plots#4

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

 Merged

etpinard
merged 5 commits into

from

Aug 3, 2023
 Merged


Add conversion of Plots.jl's plotly plots
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
274643d

add test workflow


BeastyBlacksmith Jul 28, 2023
278efea

add Plots conversion via extension


BeastyBlacksmith Jul 28, 2023
1a00ca5

add Plots to extras


BeastyBlacksmith Jul 28, 2023
75adf09

add PlotlyBase/PlotlyJS extensions and tests


BeastyBlacksmith Aug 2, 2023
57e2d73

add compats


BeastyBlacksmith Aug 2, 2023

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


20 changes: 20 additions & 0 deletions
.github/workflows/jl_test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: Julia tests

on: [push, pull_request]

jobs:
 test:
 runs-on: ubuntu-latest
 strategy:
 fail-fast: false
 matrix:
 jl_version: ["1.6", "1.8", "1.9"]
 steps:
 - uses: actions/checkout@v2
 - uses: julia-actions/setup-julia@v1
 with:
 version: ${{ matrix.jl_version }}
 - uses: julia-actions/julia-buildpkg@v1
 - uses: julia-actions/julia-runtest@v1
 with:
 annotate: true

28 changes: 26 additions & 2 deletions
Project.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,32 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

[extensions]
DashBasePlotlyBaseExt = "PlotlyBase"
DashBasePlotlyJSExt = "PlotlyJS"
DashBasePlotsExt = "Plots"

[compat]
JSON3 = "1"
julia = "1.2"
Plots = "1"
julia = "1.6"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
PackageExtensionCompat = "1"

[extras]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Plots", "PlotlyBase", "PlotlyJS", "PlotlyKaleido"]

13 changes: 13 additions & 0 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would of course break if PlotlyBase stops importing JSON.
I think this here is fine for now, but we should probably make the switch to using JSON3 exclusively inside DashBase.jl and Dash.jl. We should open an issue once this PR is merged.
Looks like PlotlyBase does define JSON3-compatible StructTypes https://github.com/JuliaPlots/PlotlyBase.jl/blob/master/src/json3.jl, but I haven't tested it

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
 pop!(data, :config, nothing)
 return data
end

end

10 changes: 10 additions & 0 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
end

end

18 changes: 18 additions & 0 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
module DashBasePlotsExt

import Plots
import DashBase


function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyBackend})
 return if haskey(Base.loaded_modules, Base.PkgId(Base.UUID("a03496cd-edff-5a9b-9e67-9cda94a718b5"), "PlotlyBase")) &&
 haskey(Base.loaded_modules, Base.PkgId(Base.UUID("f2990250-8cf9-495f-b13a-cce12b45703c"), "PlotlyKaleido"))
 # Note: technically it would be sufficient if PlotlyBase is loaded, but thats how it is currently handled by Plots.jl
 Plots.plotlybase_syncplot(p)
 else
 (data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

end

5 changes: 5 additions & 0 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -8,4 +9,8 @@ get_dash_dependencies, get_dash_renderer_pkg, get_componens_pkgs,
has_relative_path, has_dev_path, has_external_url, get_type,
get_external_url, get_dev_path, get_relative_path

function __init__()
 PackageExtensionCompat.@require_extensions
end

end # module

3 changes: 2 additions & 1 deletion
test/runtests.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
using Test
include("components.jl")
include("registry.jl")
include("test_ext.jl")
include("registry.jl")

25 changes: 25 additions & 0 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
using DashBase
using Test
using Plots
plotlyjs()

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot

Comment on lines

+7
 to 
+8

@BeastyBlacksmithBeastyBlacksmithAug 2, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard do these need to return something readable by JSON3 or is it enough, that they return something that has a to_dash method?
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Have you tried it inside a Dash.jl callback?
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

plotly()
@testset "PlotlyBase" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyBase.Plot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add conversion of Plots.jl's plotly plots#4

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

 Merged

etpinard
merged 5 commits into

from

Aug 3, 2023
 Merged


Add conversion of Plots.jl's plotly plots
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
274643d

add test workflow


BeastyBlacksmith Jul 28, 2023
278efea

add Plots conversion via extension


BeastyBlacksmith Jul 28, 2023
1a00ca5

add Plots to extras


BeastyBlacksmith Jul 28, 2023
75adf09

add PlotlyBase/PlotlyJS extensions and tests


BeastyBlacksmith Aug 2, 2023
57e2d73

add compats


BeastyBlacksmith Aug 2, 2023

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


20 changes: 20 additions & 0 deletions
.github/workflows/jl_test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: Julia tests

on: [push, pull_request]

jobs:
 test:
 runs-on: ubuntu-latest
 strategy:
 fail-fast: false
 matrix:
 jl_version: ["1.6", "1.8", "1.9"]
 steps:
 - uses: actions/checkout@v2
 - uses: julia-actions/setup-julia@v1
 with:
 version: ${{ matrix.jl_version }}
 - uses: julia-actions/julia-buildpkg@v1
 - uses: julia-actions/julia-runtest@v1
 with:
 annotate: true

28 changes: 26 additions & 2 deletions
Project.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,32 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

[extensions]
DashBasePlotlyBaseExt = "PlotlyBase"
DashBasePlotlyJSExt = "PlotlyJS"
DashBasePlotsExt = "Plots"

[compat]
JSON3 = "1"
julia = "1.2"
Plots = "1"
julia = "1.6"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
PackageExtensionCompat = "1"

[extras]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Plots", "PlotlyBase", "PlotlyJS", "PlotlyKaleido"]

13 changes: 13 additions & 0 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would of course break if PlotlyBase stops importing JSON.
I think this here is fine for now, but we should probably make the switch to using JSON3 exclusively inside DashBase.jl and Dash.jl. We should open an issue once this PR is merged.
Looks like PlotlyBase does define JSON3-compatible StructTypes https://github.com/JuliaPlots/PlotlyBase.jl/blob/master/src/json3.jl, but I haven't tested it

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
 pop!(data, :config, nothing)
 return data
end

end

10 changes: 10 additions & 0 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
end

end

18 changes: 18 additions & 0 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
module DashBasePlotsExt

import Plots
import DashBase


function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyBackend})
 return if haskey(Base.loaded_modules, Base.PkgId(Base.UUID("a03496cd-edff-5a9b-9e67-9cda94a718b5"), "PlotlyBase")) &&
 haskey(Base.loaded_modules, Base.PkgId(Base.UUID("f2990250-8cf9-495f-b13a-cce12b45703c"), "PlotlyKaleido"))
 # Note: technically it would be sufficient if PlotlyBase is loaded, but thats how it is currently handled by Plots.jl
 Plots.plotlybase_syncplot(p)
 else
 (data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

end

5 changes: 5 additions & 0 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -8,4 +9,8 @@ get_dash_dependencies, get_dash_renderer_pkg, get_componens_pkgs,
has_relative_path, has_dev_path, has_external_url, get_type,
get_external_url, get_dev_path, get_relative_path

function __init__()
 PackageExtensionCompat.@require_extensions
end

end # module

3 changes: 2 additions & 1 deletion
test/runtests.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
using Test
include("components.jl")
include("registry.jl")
include("test_ext.jl")
include("registry.jl")

25 changes: 25 additions & 0 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
using DashBase
using Test
using Plots
plotlyjs()

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot

Comment on lines

+7
 to 
+8

@BeastyBlacksmithBeastyBlacksmithAug 2, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard do these need to return something readable by JSON3 or is it enough, that they return something that has a to_dash method?
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Have you tried it inside a Dash.jl callback?
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

plotly()
@testset "PlotlyBase" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyBase.Plot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add conversion of Plots.jl's plotly plots#4

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

 Merged

etpinard
merged 5 commits into

from

Aug 3, 2023
 Merged


Add conversion of Plots.jl's plotly plots
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
274643d

add test workflow


BeastyBlacksmith Jul 28, 2023
278efea

add Plots conversion via extension


BeastyBlacksmith Jul 28, 2023
1a00ca5

add Plots to extras


BeastyBlacksmith Jul 28, 2023
75adf09

add PlotlyBase/PlotlyJS extensions and tests


BeastyBlacksmith Aug 2, 2023
57e2d73

add compats


BeastyBlacksmith Aug 2, 2023

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


20 changes: 20 additions & 0 deletions
.github/workflows/jl_test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: Julia tests

on: [push, pull_request]

jobs:
 test:
 runs-on: ubuntu-latest
 strategy:
 fail-fast: false
 matrix:
 jl_version: ["1.6", "1.8", "1.9"]
 steps:
 - uses: actions/checkout@v2
 - uses: julia-actions/setup-julia@v1
 with:
 version: ${{ matrix.jl_version }}
 - uses: julia-actions/julia-buildpkg@v1
 - uses: julia-actions/julia-runtest@v1
 with:
 annotate: true

28 changes: 26 additions & 2 deletions
Project.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,32 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

[extensions]
DashBasePlotlyBaseExt = "PlotlyBase"
DashBasePlotlyJSExt = "PlotlyJS"
DashBasePlotsExt = "Plots"

[compat]
JSON3 = "1"
julia = "1.2"
Plots = "1"
julia = "1.6"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
PackageExtensionCompat = "1"

[extras]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Plots", "PlotlyBase", "PlotlyJS", "PlotlyKaleido"]

13 changes: 13 additions & 0 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would of course break if PlotlyBase stops importing JSON.
I think this here is fine for now, but we should probably make the switch to using JSON3 exclusively inside DashBase.jl and Dash.jl. We should open an issue once this PR is merged.
Looks like PlotlyBase does define JSON3-compatible StructTypes https://github.com/JuliaPlots/PlotlyBase.jl/blob/master/src/json3.jl, but I haven't tested it

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
 pop!(data, :config, nothing)
 return data
end

end

10 changes: 10 additions & 0 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
end

end

18 changes: 18 additions & 0 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
module DashBasePlotsExt

import Plots
import DashBase


function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyBackend})
 return if haskey(Base.loaded_modules, Base.PkgId(Base.UUID("a03496cd-edff-5a9b-9e67-9cda94a718b5"), "PlotlyBase")) &&
 haskey(Base.loaded_modules, Base.PkgId(Base.UUID("f2990250-8cf9-495f-b13a-cce12b45703c"), "PlotlyKaleido"))
 # Note: technically it would be sufficient if PlotlyBase is loaded, but thats how it is currently handled by Plots.jl
 Plots.plotlybase_syncplot(p)
 else
 (data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

end

5 changes: 5 additions & 0 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -8,4 +9,8 @@ get_dash_dependencies, get_dash_renderer_pkg, get_componens_pkgs,
has_relative_path, has_dev_path, has_external_url, get_type,
get_external_url, get_dev_path, get_relative_path

function __init__()
 PackageExtensionCompat.@require_extensions
end

end # module

3 changes: 2 additions & 1 deletion
test/runtests.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
using Test
include("components.jl")
include("registry.jl")
include("test_ext.jl")
include("registry.jl")

25 changes: 25 additions & 0 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
using DashBase
using Test
using Plots
plotlyjs()

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot

Comment on lines

+7
 to 
+8

@BeastyBlacksmithBeastyBlacksmithAug 2, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard do these need to return something readable by JSON3 or is it enough, that they return something that has a to_dash method?
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Have you tried it inside a Dash.jl callback?
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

plotly()
@testset "PlotlyBase" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyBase.Plot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add conversion of Plots.jl's plotly plots#4

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

 Merged

etpinard
merged 5 commits into

from

Aug 3, 2023
 Merged


Add conversion of Plots.jl's plotly plots
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
274643d

add test workflow


BeastyBlacksmith Jul 28, 2023
278efea

add Plots conversion via extension


BeastyBlacksmith Jul 28, 2023
1a00ca5

add Plots to extras


BeastyBlacksmith Jul 28, 2023
75adf09

add PlotlyBase/PlotlyJS extensions and tests


BeastyBlacksmith Aug 2, 2023
57e2d73

add compats


BeastyBlacksmith Aug 2, 2023

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


20 changes: 20 additions & 0 deletions
.github/workflows/jl_test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: Julia tests

on: [push, pull_request]

jobs:
 test:
 runs-on: ubuntu-latest
 strategy:
 fail-fast: false
 matrix:
 jl_version: ["1.6", "1.8", "1.9"]
 steps:
 - uses: actions/checkout@v2
 - uses: julia-actions/setup-julia@v1
 with:
 version: ${{ matrix.jl_version }}
 - uses: julia-actions/julia-buildpkg@v1
 - uses: julia-actions/julia-runtest@v1
 with:
 annotate: true

28 changes: 26 additions & 2 deletions
Project.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,32 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

[extensions]
DashBasePlotlyBaseExt = "PlotlyBase"
DashBasePlotlyJSExt = "PlotlyJS"
DashBasePlotsExt = "Plots"

[compat]
JSON3 = "1"
julia = "1.2"
Plots = "1"
julia = "1.6"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
PackageExtensionCompat = "1"

[extras]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Plots", "PlotlyBase", "PlotlyJS", "PlotlyKaleido"]

13 changes: 13 additions & 0 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would of course break if PlotlyBase stops importing JSON.
I think this here is fine for now, but we should probably make the switch to using JSON3 exclusively inside DashBase.jl and Dash.jl. We should open an issue once this PR is merged.
Looks like PlotlyBase does define JSON3-compatible StructTypes https://github.com/JuliaPlots/PlotlyBase.jl/blob/master/src/json3.jl, but I haven't tested it

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
 pop!(data, :config, nothing)
 return data
end

end

10 changes: 10 additions & 0 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
end

end

18 changes: 18 additions & 0 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
module DashBasePlotsExt

import Plots
import DashBase


function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyBackend})
 return if haskey(Base.loaded_modules, Base.PkgId(Base.UUID("a03496cd-edff-5a9b-9e67-9cda94a718b5"), "PlotlyBase")) &&
 haskey(Base.loaded_modules, Base.PkgId(Base.UUID("f2990250-8cf9-495f-b13a-cce12b45703c"), "PlotlyKaleido"))
 # Note: technically it would be sufficient if PlotlyBase is loaded, but thats how it is currently handled by Plots.jl
 Plots.plotlybase_syncplot(p)
 else
 (data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

end

5 changes: 5 additions & 0 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -8,4 +9,8 @@ get_dash_dependencies, get_dash_renderer_pkg, get_componens_pkgs,
has_relative_path, has_dev_path, has_external_url, get_type,
get_external_url, get_dev_path, get_relative_path

function __init__()
 PackageExtensionCompat.@require_extensions
end

end # module

3 changes: 2 additions & 1 deletion
test/runtests.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
using Test
include("components.jl")
include("registry.jl")
include("test_ext.jl")
include("registry.jl")

25 changes: 25 additions & 0 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
using DashBase
using Test
using Plots
plotlyjs()

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot

Comment on lines

+7
 to 
+8

@BeastyBlacksmithBeastyBlacksmithAug 2, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard do these need to return something readable by JSON3 or is it enough, that they return something that has a to_dash method?
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Have you tried it inside a Dash.jl callback?
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

plotly()
@testset "PlotlyBase" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyBase.Plot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add conversion of Plots.jl's plotly plots#4

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

 Merged

etpinard
merged 5 commits into

from

Aug 3, 2023
 Merged


Add conversion of Plots.jl's plotly plots
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
274643d

add test workflow


BeastyBlacksmith Jul 28, 2023
278efea

add Plots conversion via extension


BeastyBlacksmith Jul 28, 2023
1a00ca5

add Plots to extras


BeastyBlacksmith Jul 28, 2023
75adf09

add PlotlyBase/PlotlyJS extensions and tests


BeastyBlacksmith Aug 2, 2023
57e2d73

add compats


BeastyBlacksmith Aug 2, 2023

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


20 changes: 20 additions & 0 deletions
.github/workflows/jl_test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: Julia tests

on: [push, pull_request]

jobs:
 test:
 runs-on: ubuntu-latest
 strategy:
 fail-fast: false
 matrix:
 jl_version: ["1.6", "1.8", "1.9"]
 steps:
 - uses: actions/checkout@v2
 - uses: julia-actions/setup-julia@v1
 with:
 version: ${{ matrix.jl_version }}
 - uses: julia-actions/julia-buildpkg@v1
 - uses: julia-actions/julia-runtest@v1
 with:
 annotate: true

28 changes: 26 additions & 2 deletions
Project.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,32 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

[extensions]
DashBasePlotlyBaseExt = "PlotlyBase"
DashBasePlotlyJSExt = "PlotlyJS"
DashBasePlotsExt = "Plots"

[compat]
JSON3 = "1"
julia = "1.2"
Plots = "1"
julia = "1.6"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
PackageExtensionCompat = "1"

[extras]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Plots", "PlotlyBase", "PlotlyJS", "PlotlyKaleido"]

13 changes: 13 additions & 0 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would of course break if PlotlyBase stops importing JSON.
I think this here is fine for now, but we should probably make the switch to using JSON3 exclusively inside DashBase.jl and Dash.jl. We should open an issue once this PR is merged.
Looks like PlotlyBase does define JSON3-compatible StructTypes https://github.com/JuliaPlots/PlotlyBase.jl/blob/master/src/json3.jl, but I haven't tested it

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
 pop!(data, :config, nothing)
 return data
end

end

10 changes: 10 additions & 0 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
end

end

18 changes: 18 additions & 0 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
module DashBasePlotsExt

import Plots
import DashBase


function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyBackend})
 return if haskey(Base.loaded_modules, Base.PkgId(Base.UUID("a03496cd-edff-5a9b-9e67-9cda94a718b5"), "PlotlyBase")) &&
 haskey(Base.loaded_modules, Base.PkgId(Base.UUID("f2990250-8cf9-495f-b13a-cce12b45703c"), "PlotlyKaleido"))
 # Note: technically it would be sufficient if PlotlyBase is loaded, but thats how it is currently handled by Plots.jl
 Plots.plotlybase_syncplot(p)
 else
 (data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

end

5 changes: 5 additions & 0 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -8,4 +9,8 @@ get_dash_dependencies, get_dash_renderer_pkg, get_componens_pkgs,
has_relative_path, has_dev_path, has_external_url, get_type,
get_external_url, get_dev_path, get_relative_path

function __init__()
 PackageExtensionCompat.@require_extensions
end

end # module

3 changes: 2 additions & 1 deletion
test/runtests.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
using Test
include("components.jl")
include("registry.jl")
include("test_ext.jl")
include("registry.jl")

25 changes: 25 additions & 0 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
using DashBase
using Test
using Plots
plotlyjs()

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot

Comment on lines

+7
 to 
+8

@BeastyBlacksmithBeastyBlacksmithAug 2, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard do these need to return something readable by JSON3 or is it enough, that they return something that has a to_dash method?
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Have you tried it inside a Dash.jl callback?
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

plotly()
@testset "PlotlyBase" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyBase.Plot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add conversion of Plots.jl's plotly plots#4

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

 Merged

etpinard
merged 5 commits into

from

Aug 3, 2023
 Merged


Add conversion of Plots.jl's plotly plots
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
274643d

add test workflow


BeastyBlacksmith Jul 28, 2023
278efea

add Plots conversion via extension


BeastyBlacksmith Jul 28, 2023
1a00ca5

add Plots to extras


BeastyBlacksmith Jul 28, 2023
75adf09

add PlotlyBase/PlotlyJS extensions and tests


BeastyBlacksmith Aug 2, 2023
57e2d73

add compats


BeastyBlacksmith Aug 2, 2023

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


20 changes: 20 additions & 0 deletions
.github/workflows/jl_test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
name: Julia tests

on: [push, pull_request]

jobs:
 test:
 runs-on: ubuntu-latest
 strategy:
 fail-fast: false
 matrix:
 jl_version: ["1.6", "1.8", "1.9"]
 steps:
 - uses: actions/checkout@v2
 - uses: julia-actions/setup-julia@v1
 with:
 version: ${{ matrix.jl_version }}
 - uses: julia-actions/julia-buildpkg@v1
 - uses: julia-actions/julia-runtest@v1
 with:
 annotate: true

28 changes: 26 additions & 2 deletions
Project.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,32 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

[extensions]
DashBasePlotlyBaseExt = "PlotlyBase"
DashBasePlotlyJSExt = "PlotlyJS"
DashBasePlotsExt = "Plots"

[compat]
JSON3 = "1"
julia = "1.2"
Plots = "1"
julia = "1.6"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
PackageExtensionCompat = "1"

[extras]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
PlotlyKaleido = "f2990250-8cf9-495f-b13a-cce12b45703c"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "Plots", "PlotlyBase", "PlotlyJS", "PlotlyKaleido"]

13 changes: 13 additions & 0 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would of course break if PlotlyBase stops importing JSON.
I think this here is fine for now, but we should probably make the switch to using JSON3 exclusively inside DashBase.jl and Dash.jl. We should open an issue once this PR is merged.
Looks like PlotlyBase does define JSON3-compatible StructTypes https://github.com/JuliaPlots/PlotlyBase.jl/blob/master/src/json3.jl, but I haven't tested it

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
 pop!(data, :config, nothing)
 return data
end

end

10 changes: 10 additions & 0 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
end

end

18 changes: 18 additions & 0 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
module DashBasePlotsExt

import Plots
import DashBase


function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyBackend})
 return if haskey(Base.loaded_modules, Base.PkgId(Base.UUID("a03496cd-edff-5a9b-9e67-9cda94a718b5"), "PlotlyBase")) &&
 haskey(Base.loaded_modules, Base.PkgId(Base.UUID("f2990250-8cf9-495f-b13a-cce12b45703c"), "PlotlyKaleido"))
 # Note: technically it would be sufficient if PlotlyBase is loaded, but thats how it is currently handled by Plots.jl
 Plots.plotlybase_syncplot(p)
 else
 (data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

end

5 changes: 5 additions & 0 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -8,4 +9,8 @@ get_dash_dependencies, get_dash_renderer_pkg, get_componens_pkgs,
has_relative_path, has_dev_path, has_external_url, get_type,
get_external_url, get_dev_path, get_relative_path

function __init__()
 PackageExtensionCompat.@require_extensions
end

end # module

3 changes: 2 additions & 1 deletion
test/runtests.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
using Test
include("components.jl")
include("registry.jl")
include("test_ext.jl")
include("registry.jl")

25 changes: 25 additions & 0 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
using DashBase
using Test
using Plots
plotlyjs()

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot

Comment on lines

+7
 to 
+8

@BeastyBlacksmithBeastyBlacksmithAug 2, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard do these need to return something readable by JSON3 or is it enough, that they return something that has a to_dash method?
@etpinardetpinardAug 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Have you tried it inside a Dash.jl callback?
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end

plotly()
@testset "PlotlyBase" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyBase.Plot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
end