Fixup DashBasePlotsExt#9

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 4 commits into from
Aug 24, 2023
Merged

Fixup DashBasePlotsExt#9

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
e3cc126
improve pkg extensions tests
etpinard Aug 23, 2023
5fd38d7
fix `to_dash` in `DashBasePlotsExt`
etpinard Aug 23, 2023
fce43fb
replace with `PackageExtensionCompat`
etpinard Aug 24, 2023
e8aa7cf
Merge pull request #10 from plotly/drop-packageextensioncompat
etpinard Aug 24, 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
26 changes: 13 additions & 13 deletions Project.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,21 @@ version = "0.2.0"

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
[compat]
JSON3 = "1"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
Plots = "1"
Requires = "1.3"
julia = "1.6"

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

[compat]
JSON3 = "1"
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"
Expand All@@ -34,3 +29,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

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

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
8 changes: 5 additions & 3 deletions ext/DashBasePlotlyBaseExt.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyBase) : (using ..PlotlyBase)

const JSON = PlotlyBase.JSON

function DashBase.to_dash(p::PlotlyBase.Plot)
data = JSON.lower(p)
Expand Down
5 changes: 3 additions & 2 deletions ext/DashBasePlotlyJSExt.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyJS) : (using ..PlotlyJS)

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
DashBase.to_dash(p.plot)
Expand Down
15 changes: 10 additions & 5 deletions ext/DashBasePlotsExt.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
module DashBasePlotsExt

import Plots
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using Plots) : (using ..Plots)

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)
sp = Plots.plotlybase_syncplot(p)
DashBase.to_dash(sp)
else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
Dict(:data => Plots.plotly_series(p), :layout => Plots.plotly_layout(p))
end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend})
sp = Plots.plotlyjs_syncplot(p)
return DashBase.to_dash(sp)
end

end
11 changes: 9 additions & 2 deletions src/DashBase.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -9,8 +8,16 @@ 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

@static if !isdefined(Base, :get_extension)
using Requires
end

function __init__()
PackageExtensionCompat.@require_extensions
@static if !isdefined(Base, :get_extension)
@require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" include("../ext/DashBasePlotlyBaseExt.jl")
@require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include("../ext/DashBasePlotlyJSExt.jl")
@require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" include("../ext/DashBasePlotsExt.jl")
end
end

end # module
51 changes: 31 additions & 20 deletions test/test_ext.jl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
using DashBase
using Test
using Plots
plotlyjs()
using DashBase
import PlotlyBase
import PlotlyJS
import Plots

function run_assertions(pl)
obj = @test_nowarn DashBase.to_dash(pl)
@test obj isa Dict{Symbol, Any}
@test obj[:data][1][:y] == [1, 2, 3, 4, 5]
@test haskey(obj, :layout)
@test haskey(obj, :frames)
@test !haskey(obj, :config)
end

@testset "DashBasePlotlyBaseExt" begin
pl = PlotlyBase.Plot(1:5)
run_assertions(pl)
end

@testset "DashBasePlotsJSExt" begin
pl = PlotlyJS.plot(1:5)
run_assertions(pl)
end

@testset "PlotlyJS" begin
pl = @test_nowarn DashBase.to_dash(plot(1:5))
@test pl isa PlotlyJS.SyncPlot
pl = @test_nowarn DashBase.to_dash(pl)
@test haskey(pl, :layout)
@test haskey(pl, :data)
@test haskey(pl, :frames)
@test !haskey(pl, :config)
@testset "DashBasePlotsExt + plotlyjs()" begin
Plots.plotlyjs()
pl = Plots.plot(1:5)
run_assertions(pl)
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)
@testset "DashBasePlotsExt + plotly()" begin
Plots.plotly()
pl = Plots.plot(1:5)
run_assertions(pl)
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
Fixup DashBasePlotsExt#9

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 4 commits into

from

Aug 24, 2023
 Merged


Fixup DashBasePlotsExt#9
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
e3cc126

improve pkg extensions tests


etpinard Aug 23, 2023
5fd38d7

fix `to_dash` in `DashBasePlotsExt`


etpinard Aug 23, 2023
fce43fb

replace with `PackageExtensionCompat`


etpinard Aug 24, 2023
e8aa7cf

Merge pull request #10 from plotly/drop-packageextensioncompat


etpinard Aug 24, 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


26 changes: 13 additions & 13 deletions
Project.toml

View file


Open in desktop

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

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
[compat]
JSON3 = "1"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
Plots = "1"
Requires = "1.3"
julia = "1.6"

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

[compat]
JSON3 = "1"
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"
Expand All@@ -34,3 +29,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

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

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

8 changes: 5 additions & 3 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyBase) : (using ..PlotlyBase)

const JSON = PlotlyBase.JSON

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
Expand Down

5 changes: 3 additions & 2 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyJS) : (using ..PlotlyJS)

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
Expand Down

15 changes: 10 additions & 5 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

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

import Plots
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using Plots) : (using ..Plots)

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)
 sp = Plots.plotlybase_syncplot(p)
 DashBase.to_dash(sp)
 else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
Dict(:data => Plots.plotly_series(p), :layout => Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend})
 sp = Plots.plotlyjs_syncplot(p)
 return DashBase.to_dash(sp)
end

end

11 changes: 9 additions & 2 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -9,8 +8,16 @@ 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

@static if !isdefined(Base, :get_extension)
using Requires
end

function __init__()
 PackageExtensionCompat.@require_extensions
 @static if !isdefined(Base, :get_extension)
 @require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" include("../ext/DashBasePlotlyBaseExt.jl")
 @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include("../ext/DashBasePlotlyJSExt.jl")
 @require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" include("../ext/DashBasePlotsExt.jl")
 end
end

end # module

51 changes: 31 additions & 20 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
using DashBase
using Test
using Plots
plotlyjs()
using DashBase
import PlotlyBase
import PlotlyJS
import Plots

function run_assertions(pl)
 obj = @test_nowarn DashBase.to_dash(pl)
 @test obj isa Dict{Symbol, Any}
 @test obj[:data][1][:y] == [1, 2, 3, 4, 5]
 @test haskey(obj, :layout)
 @test haskey(obj, :frames)
 @test !haskey(obj, :config)
end

@testset "DashBasePlotlyBaseExt" begin
 pl = PlotlyBase.Plot(1:5)
 run_assertions(pl)
end

@testset "DashBasePlotsJSExt" begin
 pl = PlotlyJS.plot(1:5)
 run_assertions(pl)
end

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
@testset "DashBasePlotsExt + plotlyjs()" begin
 Plots.plotlyjs()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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)
@testset "DashBasePlotsExt + plotly()" begin
 Plots.plotly()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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
Fixup DashBasePlotsExt#9

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 4 commits into

from

Aug 24, 2023
 Merged


Fixup DashBasePlotsExt#9
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
e3cc126

improve pkg extensions tests


etpinard Aug 23, 2023
5fd38d7

fix `to_dash` in `DashBasePlotsExt`


etpinard Aug 23, 2023
fce43fb

replace with `PackageExtensionCompat`


etpinard Aug 24, 2023
e8aa7cf

Merge pull request #10 from plotly/drop-packageextensioncompat


etpinard Aug 24, 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


26 changes: 13 additions & 13 deletions
Project.toml

View file


Open in desktop

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

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
[compat]
JSON3 = "1"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
Plots = "1"
Requires = "1.3"
julia = "1.6"

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

[compat]
JSON3 = "1"
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"
Expand All@@ -34,3 +29,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

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

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

8 changes: 5 additions & 3 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyBase) : (using ..PlotlyBase)

const JSON = PlotlyBase.JSON

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
Expand Down

5 changes: 3 additions & 2 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyJS) : (using ..PlotlyJS)

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
Expand Down

15 changes: 10 additions & 5 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

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

import Plots
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using Plots) : (using ..Plots)

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)
 sp = Plots.plotlybase_syncplot(p)
 DashBase.to_dash(sp)
 else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
Dict(:data => Plots.plotly_series(p), :layout => Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend})
 sp = Plots.plotlyjs_syncplot(p)
 return DashBase.to_dash(sp)
end

end

11 changes: 9 additions & 2 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -9,8 +8,16 @@ 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

@static if !isdefined(Base, :get_extension)
using Requires
end

function __init__()
 PackageExtensionCompat.@require_extensions
 @static if !isdefined(Base, :get_extension)
 @require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" include("../ext/DashBasePlotlyBaseExt.jl")
 @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include("../ext/DashBasePlotlyJSExt.jl")
 @require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" include("../ext/DashBasePlotsExt.jl")
 end
end

end # module

51 changes: 31 additions & 20 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
using DashBase
using Test
using Plots
plotlyjs()
using DashBase
import PlotlyBase
import PlotlyJS
import Plots

function run_assertions(pl)
 obj = @test_nowarn DashBase.to_dash(pl)
 @test obj isa Dict{Symbol, Any}
 @test obj[:data][1][:y] == [1, 2, 3, 4, 5]
 @test haskey(obj, :layout)
 @test haskey(obj, :frames)
 @test !haskey(obj, :config)
end

@testset "DashBasePlotlyBaseExt" begin
 pl = PlotlyBase.Plot(1:5)
 run_assertions(pl)
end

@testset "DashBasePlotsJSExt" begin
 pl = PlotlyJS.plot(1:5)
 run_assertions(pl)
end

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
@testset "DashBasePlotsExt + plotlyjs()" begin
 Plots.plotlyjs()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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)
@testset "DashBasePlotsExt + plotly()" begin
 Plots.plotly()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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
Fixup DashBasePlotsExt#9

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 4 commits into

from

Aug 24, 2023
 Merged


Fixup DashBasePlotsExt#9
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
e3cc126

improve pkg extensions tests


etpinard Aug 23, 2023
5fd38d7

fix `to_dash` in `DashBasePlotsExt`


etpinard Aug 23, 2023
fce43fb

replace with `PackageExtensionCompat`


etpinard Aug 24, 2023
e8aa7cf

Merge pull request #10 from plotly/drop-packageextensioncompat


etpinard Aug 24, 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


26 changes: 13 additions & 13 deletions
Project.toml

View file


Open in desktop

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

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
[compat]
JSON3 = "1"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
Plots = "1"
Requires = "1.3"
julia = "1.6"

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

[compat]
JSON3 = "1"
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"
Expand All@@ -34,3 +29,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

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

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

8 changes: 5 additions & 3 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyBase) : (using ..PlotlyBase)

const JSON = PlotlyBase.JSON

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
Expand Down

5 changes: 3 additions & 2 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyJS) : (using ..PlotlyJS)

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
Expand Down

15 changes: 10 additions & 5 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

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

import Plots
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using Plots) : (using ..Plots)

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)
 sp = Plots.plotlybase_syncplot(p)
 DashBase.to_dash(sp)
 else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
Dict(:data => Plots.plotly_series(p), :layout => Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend})
 sp = Plots.plotlyjs_syncplot(p)
 return DashBase.to_dash(sp)
end

end

11 changes: 9 additions & 2 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -9,8 +8,16 @@ 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

@static if !isdefined(Base, :get_extension)
using Requires
end

function __init__()
 PackageExtensionCompat.@require_extensions
 @static if !isdefined(Base, :get_extension)
 @require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" include("../ext/DashBasePlotlyBaseExt.jl")
 @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include("../ext/DashBasePlotlyJSExt.jl")
 @require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" include("../ext/DashBasePlotsExt.jl")
 end
end

end # module

51 changes: 31 additions & 20 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
using DashBase
using Test
using Plots
plotlyjs()
using DashBase
import PlotlyBase
import PlotlyJS
import Plots

function run_assertions(pl)
 obj = @test_nowarn DashBase.to_dash(pl)
 @test obj isa Dict{Symbol, Any}
 @test obj[:data][1][:y] == [1, 2, 3, 4, 5]
 @test haskey(obj, :layout)
 @test haskey(obj, :frames)
 @test !haskey(obj, :config)
end

@testset "DashBasePlotlyBaseExt" begin
 pl = PlotlyBase.Plot(1:5)
 run_assertions(pl)
end

@testset "DashBasePlotsJSExt" begin
 pl = PlotlyJS.plot(1:5)
 run_assertions(pl)
end

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
@testset "DashBasePlotsExt + plotlyjs()" begin
 Plots.plotlyjs()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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)
@testset "DashBasePlotsExt + plotly()" begin
 Plots.plotly()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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
Fixup DashBasePlotsExt#9

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 4 commits into

from

Aug 24, 2023
 Merged


Fixup DashBasePlotsExt#9
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
e3cc126

improve pkg extensions tests


etpinard Aug 23, 2023
5fd38d7

fix `to_dash` in `DashBasePlotsExt`


etpinard Aug 23, 2023
fce43fb

replace with `PackageExtensionCompat`


etpinard Aug 24, 2023
e8aa7cf

Merge pull request #10 from plotly/drop-packageextensioncompat


etpinard Aug 24, 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


26 changes: 13 additions & 13 deletions
Project.toml

View file


Open in desktop

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

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
[compat]
JSON3 = "1"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
Plots = "1"
Requires = "1.3"
julia = "1.6"

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

[compat]
JSON3 = "1"
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"
Expand All@@ -34,3 +29,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

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

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

8 changes: 5 additions & 3 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyBase) : (using ..PlotlyBase)

const JSON = PlotlyBase.JSON

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
Expand Down

5 changes: 3 additions & 2 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyJS) : (using ..PlotlyJS)

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
Expand Down

15 changes: 10 additions & 5 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

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

import Plots
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using Plots) : (using ..Plots)

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)
 sp = Plots.plotlybase_syncplot(p)
 DashBase.to_dash(sp)
 else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
Dict(:data => Plots.plotly_series(p), :layout => Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend})
 sp = Plots.plotlyjs_syncplot(p)
 return DashBase.to_dash(sp)
end

end

11 changes: 9 additions & 2 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -9,8 +8,16 @@ 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

@static if !isdefined(Base, :get_extension)
using Requires
end

function __init__()
 PackageExtensionCompat.@require_extensions
 @static if !isdefined(Base, :get_extension)
 @require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" include("../ext/DashBasePlotlyBaseExt.jl")
 @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include("../ext/DashBasePlotlyJSExt.jl")
 @require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" include("../ext/DashBasePlotsExt.jl")
 end
end

end # module

51 changes: 31 additions & 20 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
using DashBase
using Test
using Plots
plotlyjs()
using DashBase
import PlotlyBase
import PlotlyJS
import Plots

function run_assertions(pl)
 obj = @test_nowarn DashBase.to_dash(pl)
 @test obj isa Dict{Symbol, Any}
 @test obj[:data][1][:y] == [1, 2, 3, 4, 5]
 @test haskey(obj, :layout)
 @test haskey(obj, :frames)
 @test !haskey(obj, :config)
end

@testset "DashBasePlotlyBaseExt" begin
 pl = PlotlyBase.Plot(1:5)
 run_assertions(pl)
end

@testset "DashBasePlotsJSExt" begin
 pl = PlotlyJS.plot(1:5)
 run_assertions(pl)
end

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
@testset "DashBasePlotsExt + plotlyjs()" begin
 Plots.plotlyjs()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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)
@testset "DashBasePlotsExt + plotly()" begin
 Plots.plotly()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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
Fixup DashBasePlotsExt#9

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 4 commits into

from

Aug 24, 2023
 Merged


Fixup DashBasePlotsExt#9
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
e3cc126

improve pkg extensions tests


etpinard Aug 23, 2023
5fd38d7

fix `to_dash` in `DashBasePlotsExt`


etpinard Aug 23, 2023
fce43fb

replace with `PackageExtensionCompat`


etpinard Aug 24, 2023
e8aa7cf

Merge pull request #10 from plotly/drop-packageextensioncompat


etpinard Aug 24, 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


26 changes: 13 additions & 13 deletions
Project.toml

View file


Open in desktop

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

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
[compat]
JSON3 = "1"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
Plots = "1"
Requires = "1.3"
julia = "1.6"

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

[compat]
JSON3 = "1"
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"
Expand All@@ -34,3 +29,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

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

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

8 changes: 5 additions & 3 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyBase) : (using ..PlotlyBase)

const JSON = PlotlyBase.JSON

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
Expand Down

5 changes: 3 additions & 2 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyJS) : (using ..PlotlyJS)

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
Expand Down

15 changes: 10 additions & 5 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

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

import Plots
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using Plots) : (using ..Plots)

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)
 sp = Plots.plotlybase_syncplot(p)
 DashBase.to_dash(sp)
 else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
Dict(:data => Plots.plotly_series(p), :layout => Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend})
 sp = Plots.plotlyjs_syncplot(p)
 return DashBase.to_dash(sp)
end

end

11 changes: 9 additions & 2 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -9,8 +8,16 @@ 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

@static if !isdefined(Base, :get_extension)
using Requires
end

function __init__()
 PackageExtensionCompat.@require_extensions
 @static if !isdefined(Base, :get_extension)
 @require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" include("../ext/DashBasePlotlyBaseExt.jl")
 @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include("../ext/DashBasePlotlyJSExt.jl")
 @require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" include("../ext/DashBasePlotsExt.jl")
 end
end

end # module

51 changes: 31 additions & 20 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
using DashBase
using Test
using Plots
plotlyjs()
using DashBase
import PlotlyBase
import PlotlyJS
import Plots

function run_assertions(pl)
 obj = @test_nowarn DashBase.to_dash(pl)
 @test obj isa Dict{Symbol, Any}
 @test obj[:data][1][:y] == [1, 2, 3, 4, 5]
 @test haskey(obj, :layout)
 @test haskey(obj, :frames)
 @test !haskey(obj, :config)
end

@testset "DashBasePlotlyBaseExt" begin
 pl = PlotlyBase.Plot(1:5)
 run_assertions(pl)
end

@testset "DashBasePlotsJSExt" begin
 pl = PlotlyJS.plot(1:5)
 run_assertions(pl)
end

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
@testset "DashBasePlotsExt + plotlyjs()" begin
 Plots.plotlyjs()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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)
@testset "DashBasePlotsExt + plotly()" begin
 Plots.plotly()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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
Fixup DashBasePlotsExt#9

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 4 commits into

from

Aug 24, 2023
 Merged


Fixup DashBasePlotsExt#9
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
e3cc126

improve pkg extensions tests


etpinard Aug 23, 2023
5fd38d7

fix `to_dash` in `DashBasePlotsExt`


etpinard Aug 23, 2023
fce43fb

replace with `PackageExtensionCompat`


etpinard Aug 24, 2023
e8aa7cf

Merge pull request #10 from plotly/drop-packageextensioncompat


etpinard Aug 24, 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


26 changes: 13 additions & 13 deletions
Project.toml

View file


Open in desktop

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

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
[compat]
JSON3 = "1"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
Plots = "1"
Requires = "1.3"
julia = "1.6"

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

[compat]
JSON3 = "1"
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"
Expand All@@ -34,3 +29,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

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

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

8 changes: 5 additions & 3 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyBase) : (using ..PlotlyBase)

const JSON = PlotlyBase.JSON

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
Expand Down

5 changes: 3 additions & 2 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyJS) : (using ..PlotlyJS)

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
Expand Down

15 changes: 10 additions & 5 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

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

import Plots
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using Plots) : (using ..Plots)

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)
 sp = Plots.plotlybase_syncplot(p)
 DashBase.to_dash(sp)
 else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
Dict(:data => Plots.plotly_series(p), :layout => Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend})
 sp = Plots.plotlyjs_syncplot(p)
 return DashBase.to_dash(sp)
end

end

11 changes: 9 additions & 2 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -9,8 +8,16 @@ 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

@static if !isdefined(Base, :get_extension)
using Requires
end

function __init__()
 PackageExtensionCompat.@require_extensions
 @static if !isdefined(Base, :get_extension)
 @require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" include("../ext/DashBasePlotlyBaseExt.jl")
 @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include("../ext/DashBasePlotlyJSExt.jl")
 @require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" include("../ext/DashBasePlotsExt.jl")
 end
end

end # module

51 changes: 31 additions & 20 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
using DashBase
using Test
using Plots
plotlyjs()
using DashBase
import PlotlyBase
import PlotlyJS
import Plots

function run_assertions(pl)
 obj = @test_nowarn DashBase.to_dash(pl)
 @test obj isa Dict{Symbol, Any}
 @test obj[:data][1][:y] == [1, 2, 3, 4, 5]
 @test haskey(obj, :layout)
 @test haskey(obj, :frames)
 @test !haskey(obj, :config)
end

@testset "DashBasePlotlyBaseExt" begin
 pl = PlotlyBase.Plot(1:5)
 run_assertions(pl)
end

@testset "DashBasePlotsJSExt" begin
 pl = PlotlyJS.plot(1:5)
 run_assertions(pl)
end

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
@testset "DashBasePlotsExt + plotlyjs()" begin
 Plots.plotlyjs()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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)
@testset "DashBasePlotsExt + plotly()" begin
 Plots.plotly()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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
Fixup DashBasePlotsExt#9

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 4 commits into

from

Aug 24, 2023
 Merged


Fixup DashBasePlotsExt#9
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
e3cc126

improve pkg extensions tests


etpinard Aug 23, 2023
5fd38d7

fix `to_dash` in `DashBasePlotsExt`


etpinard Aug 23, 2023
fce43fb

replace with `PackageExtensionCompat`


etpinard Aug 24, 2023
e8aa7cf

Merge pull request #10 from plotly/drop-packageextensioncompat


etpinard Aug 24, 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


26 changes: 13 additions & 13 deletions
Project.toml

View file


Open in desktop

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

[deps]
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
[compat]
JSON3 = "1"
PlotlyBase = "0.8"
PlotlyJS = "0.18"
Plots = "1"
Requires = "1.3"
julia = "1.6"

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

[compat]
JSON3 = "1"
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"
Expand All@@ -34,3 +29,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

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

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

8 changes: 5 additions & 3 deletions
ext/DashBasePlotlyBaseExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
module DashBasePlotlyBaseExt

import DashBase
import PlotlyBase
import PlotlyBase.JSON
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyBase) : (using ..PlotlyBase)

const JSON = PlotlyBase.JSON

function DashBase.to_dash(p::PlotlyBase.Plot)
 data = JSON.lower(p)
Expand Down

5 changes: 3 additions & 2 deletions
ext/DashBasePlotlyJSExt.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
module DashBasePlotlyJSExt

import PlotlyJS
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using PlotlyJS) : (using ..PlotlyJS)

function DashBase.to_dash(p::PlotlyJS.SyncPlot)
 DashBase.to_dash(p.plot)
Expand Down

15 changes: 10 additions & 5 deletions
ext/DashBasePlotsExt.jl

View file


Open in desktop

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

import Plots
import DashBase
using DashBase

isdefined(Base, :get_extension) ? (using Plots) : (using ..Plots)

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)
 sp = Plots.plotlybase_syncplot(p)
 DashBase.to_dash(sp)
 else
(data = Plots.plotly_series(p), layout = Plots.plotly_layout(p))
Dict(:data => Plots.plotly_series(p), :layout => Plots.plotly_layout(p))
 end
end
DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend}) = Plots.plotlyjs_syncplot(p)

function DashBase.to_dash(p::Plots.Plot{Plots.PlotlyJSBackend})
 sp = Plots.plotlyjs_syncplot(p)
 return DashBase.to_dash(sp)
end

end

11 changes: 9 additions & 2 deletions
src/DashBase.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
module DashBase
import JSON3
import PackageExtensionCompat
include("components.jl")
include("registry.jl")
export Component, push_prop!, get_name, get_type, get_namespace,
Expand All@@ -9,8 +8,16 @@ 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

@static if !isdefined(Base, :get_extension)
using Requires
end

function __init__()
 PackageExtensionCompat.@require_extensions
 @static if !isdefined(Base, :get_extension)
 @require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" include("../ext/DashBasePlotlyBaseExt.jl")
 @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include("../ext/DashBasePlotlyJSExt.jl")
 @require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" include("../ext/DashBasePlotsExt.jl")
 end
end

end # module

51 changes: 31 additions & 20 deletions
test/test_ext.jl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
using DashBase
using Test
using Plots
plotlyjs()
using DashBase
import PlotlyBase
import PlotlyJS
import Plots

function run_assertions(pl)
 obj = @test_nowarn DashBase.to_dash(pl)
 @test obj isa Dict{Symbol, Any}
 @test obj[:data][1][:y] == [1, 2, 3, 4, 5]
 @test haskey(obj, :layout)
 @test haskey(obj, :frames)
 @test !haskey(obj, :config)
end

@testset "DashBasePlotlyBaseExt" begin
 pl = PlotlyBase.Plot(1:5)
 run_assertions(pl)
end

@testset "DashBasePlotsJSExt" begin
 pl = PlotlyJS.plot(1:5)
 run_assertions(pl)
end

@testset "PlotlyJS" begin
 pl = @test_nowarn DashBase.to_dash(plot(1:5))
 @test pl isa PlotlyJS.SyncPlot
 pl = @test_nowarn DashBase.to_dash(pl)
 @test haskey(pl, :layout)
 @test haskey(pl, :data)
 @test haskey(pl, :frames)
 @test !haskey(pl, :config)
@testset "DashBasePlotsExt + plotlyjs()" begin
 Plots.plotlyjs()
 pl = Plots.plot(1:5)
 run_assertions(pl)
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)
@testset "DashBasePlotsExt + plotly()" begin
 Plots.plotly()
 pl = Plots.plot(1:5)
 run_assertions(pl)
end