Merge branch 'master' of https://github.com/GenieFramework/Stipple.jl

# Conflicts: # Project.toml
GenieFramework · Apr 12, 2024 · 099aa5f · 099aa5f
2 parents 2aaa859 + e88e905
commit 099aa5f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/ext/StippleDataFramesExt.jl b/ext/StippleDataFramesExt.jl
@@ -2,10 +2,16 @@ module StippleDataFramesExt
 
 using Stipple
 
-isdefined(Base, :get_extension) ? using DataFrames : using ..DataFrames
+isdefined(Base, :get_extension) ? (using DataFrames) : (using ..DataFrames)
+
+# DataFrame(d::Dict) will generate multiple rows if a field contains a Vector
+# to prevent this we need to wrap vectors in a Ref()
+function dataframe(d::Dict)
+  DataFrame([p[1] => p[2] isa Vector ? Ref(p[2]) : p[2] for p in d])
+end
 
 function Stipple.stipple_parse(::Type{DF} where DF <: DataFrames.AbstractDataFrame, d::Vector)
-  isempty(d) ? DF() : reduce(vcat, DataFrames.DataFrame.(d))
+  isempty(d) ? DF() : reduce(vcat, dataframe.(d))
 end
 
 function Stipple.render(df::DataFrames.AbstractDataFrame)

diff --git a/ext/StippleJSONExt.jl b/ext/StippleJSONExt.jl
@@ -2,7 +2,7 @@ module StippleJSONExt
 
 using Stipple
 
-isdefined(Base, :get_extension) ? using JSON : using ..JSON
+isdefined(Base, :get_extension) ? (using JSON) : (using ..JSON)
 
 # garantee interoperability of different JSONTText definitions in Stipple and JSON
 # for both JSON3 and JSON

diff --git a/ext/StippleOffsetArraysExt.jl b/ext/StippleOffsetArraysExt.jl
@@ -2,7 +2,7 @@ module StippleOffsetArraysExt
 
 using Stipple
 
-isdefined(Base, :get_extension) ? using OffsetArrays : using ..OffsetArrays
+isdefined(Base, :get_extension) ? (using OffsetArrays) : (using ..OffsetArrays)
 
 function Stipple.convertvalue(targetfield::Union{Ref{T}, Reactive{T}}, value) where T <: OffsetArrays.OffsetArray
   a = Stipple.stipple_parse(eltype(targetfield), value)