Skip to content

Add <g> tags to several components to aid with testing and DOM organization #30

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
Croge32 merged 3 commits into from
Jun 5, 2026
Merged

Add <g> tags to several components to aid with testing and DOM organization #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1270a7c
Add <g> tags to several components to aid with testing and DOM organi…
Croge32 Jun 4, 2026
81c9719
Make 'id' into an attribute, default to 'nil'
Croge32 Jun 4, 2026
0b048d1
bump version to 0.3.3
Croge32 Jun 5, 2026
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
254 changes: 135 additions & 119 deletions lib/plox.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ defmodule Plox do
"""
@doc type: :component

attr :id, :string, default: nil
attr :dataset, :any, required: true

attr :x, :atom, default: :x, doc: "The dataset axis key to use for x values"
Expand All @@ -211,25 +212,29 @@ defmodule Plox do

def line_plot(%{type: :line} = assigns) do
~H"""
<polyline
points={@dataset |> GraphDataset.to_graph_points(@x, @y) |> polyline_points()}
fill="none"
stroke={@color}
stroke-width={@width}
stroke-dasharray={stroke_dasharray(@line_style)}
/>
<g id={@id}>
<polyline
points={@dataset |> GraphDataset.to_graph_points(@x, @y) |> polyline_points()}
fill="none"
stroke={@color}
stroke-width={@width}
stroke-dasharray={stroke_dasharray(@line_style)}
/>
</g>
"""
end

def line_plot(%{type: :step_line} = assigns) do
~H"""
<polyline
points={@dataset |> step_points(@x, @y) |> polyline_points()}
fill="none"
stroke={@color}
stroke-width={@width}
stroke-dasharray={stroke_dasharray(@line_style)}
/>
<g id={@id}>
<polyline
points={@dataset |> step_points(@x, @y) |> polyline_points()}
fill="none"
stroke={@color}
stroke-width={@width}
stroke-dasharray={stroke_dasharray(@line_style)}
/>
</g>
"""
end

Expand All @@ -250,6 +255,7 @@ defmodule Plox do
"""
@doc type: :component

attr :id, :string, default: nil
attr :dataset, :any, required: true

attr :x, :atom, default: :x, doc: "The dataset axis key to use for x values"
Expand All @@ -262,27 +268,29 @@ defmodule Plox do

def points_plot(assigns) do
~H"""
<circle
:for={point <- GraphDataset.to_graph_points(@dataset, @x, @y)}
phx-click={
if assigns[:"phx-click"],
do:
JS.push(assigns[:"phx-click"],
value: %{
id: point.data_point.id,
dataset_id: @dataset.id,
x_pixel: point.x,
y_pixel: point.y
}
)
}
phx-target={assigns[:"phx-target"]}
style={if assigns[:"phx-click"], do: "cursor: pointer;"}
fill={GraphDataset.to_color(@dataset, @color, point.data_point)}
cx={point.x}
cy={point.y}
r={@radius}
/>
<g id={@id}>
<circle
:for={point <- GraphDataset.to_graph_points(@dataset, @x, @y)}
phx-click={
if assigns[:"phx-click"],
do:
JS.push(assigns[:"phx-click"],
value: %{
id: point.data_point.id,
dataset_id: @dataset.id,
x_pixel: point.x,
y_pixel: point.y
}
)
}
phx-target={assigns[:"phx-target"]}
style={if assigns[:"phx-click"], do: "cursor: pointer;"}
fill={GraphDataset.to_color(@dataset, @color, point.data_point)}
cx={point.x}
cy={point.y}
r={@radius}
/>
</g>
"""
end

Expand All @@ -291,6 +299,7 @@ defmodule Plox do
"""
@doc type: :component

attr :id, :string, default: nil
attr :dataset, :any, required: true

attr :x, :atom, default: :x, doc: "The dataset axis key to use for x values"
Expand All @@ -308,34 +317,36 @@ defmodule Plox do

def bar_plot(assigns) do
~H"""
<%= for point <- GraphDataset.to_graph_points(@dataset, @x, @y) do %>
<line
phx-click={
if assigns[:"phx-click"],
do:
JS.push(assigns[:"phx-click"],
value: %{
id: point.data_point.id,
dataset_id: @dataset.id,
x_pixel: point.x,
y_pixel: point.y
}
)
}
phx-target={assigns[:"phx-target"]}
style={if assigns[:"phx-click"], do: "cursor: pointer;"}
x1={point.x}
y1={point.y}
x2={point.x}
y2={
@dataset.dimensions.height - @dataset.dimensions.margin.bottom -
@dataset.dimensions.padding.bottom
}
stroke={GraphDataset.to_color(@dataset, @color, point.data_point)}
stroke-width={@width}
stroke-linecap={bar_style(@bar_style)}
/>
<% end %>
<g id={@id}>
<%= for point <- GraphDataset.to_graph_points(@dataset, @x, @y) do %>
<line
phx-click={
if assigns[:"phx-click"],
do:
JS.push(assigns[:"phx-click"],
value: %{
id: point.data_point.id,
dataset_id: @dataset.id,
x_pixel: point.x,
y_pixel: point.y
}
)
}
phx-target={assigns[:"phx-target"]}
style={if assigns[:"phx-click"], do: "cursor: pointer;"}
x1={point.x}
y1={point.y}
x2={point.x}
y2={
@dataset.dimensions.height - @dataset.dimensions.margin.bottom -
@dataset.dimensions.padding.bottom
}
stroke={GraphDataset.to_color(@dataset, @color, point.data_point)}
stroke-width={@width}
stroke-linecap={bar_style(@bar_style)}
/>
<% end %>
</g>
"""
end

Expand Down Expand Up @@ -422,6 +433,7 @@ defmodule Plox do
"""
@doc type: :component

attr :id, :string, default: nil
attr :dataset, :any, required: true

attr :area, :atom, required: true, doc: "The dataset axis key to use for the area plots"
Expand All @@ -434,67 +446,71 @@ defmodule Plox do

def area_plot(%{orientation: :horizontal} = assigns) do
~H"""
<%= for [scalar1, scalar2] <- area_points(@dataset, @area, @orientation), rect_color = GraphDataset.to_color(@dataset, @color, scalar1.data_point) do %>
<rect
:if={!is_nil(rect_color)}
fill={rect_color}
height={
@dataset.dimensions.height - @dataset.dimensions.margin.top -
@dataset.dimensions.margin.bottom
}
width={scalar2.value - scalar1.value}
x={scalar1.value}
y={@dataset.dimensions.margin.top}
phx-click={
if assigns[:"phx-click"],
do:
JS.push(assigns[:"phx-click"],
value: %{
start_area_point_id: scalar1.data_point.id,
end_area_point_id: scalar2.data_point.id,
dataset_id: @dataset.id,
x_pixel: scalar1.value + (scalar2.value - scalar1.value) / 2,
y_pixel: @dataset.dimensions.margin.top + @dataset.dimensions.height / 2
}
)
}
style={if assigns[:"phx-click"], do: "cursor: pointer;"}
phx-target={assigns[:"phx-target"]}
/>
<% end %>
<g id={@id}>
<%= for [scalar1, scalar2] <- area_points(@dataset, @area, @orientation), rect_color = GraphDataset.to_color(@dataset, @color, scalar1.data_point) do %>
<rect
:if={!is_nil(rect_color)}
fill={rect_color}
height={
@dataset.dimensions.height - @dataset.dimensions.margin.top -
@dataset.dimensions.margin.bottom
}
width={scalar2.value - scalar1.value}
x={scalar1.value}
y={@dataset.dimensions.margin.top}
phx-click={
if assigns[:"phx-click"],
do:
JS.push(assigns[:"phx-click"],
value: %{
start_area_point_id: scalar1.data_point.id,
end_area_point_id: scalar2.data_point.id,
dataset_id: @dataset.id,
x_pixel: scalar1.value + (scalar2.value - scalar1.value) / 2,
y_pixel: @dataset.dimensions.margin.top + @dataset.dimensions.height / 2
}
)
}
style={if assigns[:"phx-click"], do: "cursor: pointer;"}
phx-target={assigns[:"phx-target"]}
/>
<% end %>
</g>
"""
end

def area_plot(%{orientation: :vertical} = assigns) do
~H"""
<%= for [scalar1, scalar2] <- area_points(@dataset, @area, @orientation), rect_color = GraphDataset.to_color(@dataset, @color, scalar1.data_point) do %>
<rect
:if={!is_nil(rect_color)}
fill={rect_color}
height={scalar1.value - scalar2.value}
width={
@dataset.dimensions.width - @dataset.dimensions.margin.left -
@dataset.dimensions.margin.right
}
x={@dataset.dimensions.margin.left}
y={scalar1.value - (scalar1.value - scalar2.value)}
phx-click={
if assigns[:"phx-click"],
do:
JS.push(assigns[:"phx-click"],
value: %{
start_area_point_id: scalar1.data_point.id,
end_area_point_id: scalar2.data_point.id,
dataset_id: @dataset.id,
x_pixel: @dataset.dimensions.margin.left + @dataset.dimensions.width / 2,
y_pixel: scalar2.value + (scalar1.value - scalar2.value) / 2
}
)
}
style={if assigns[:"phx-click"], do: "cursor: pointer;"}
phx-target={assigns[:"phx-target"]}
/>
<% end %>
<g id={@id}>
<%= for [scalar1, scalar2] <- area_points(@dataset, @area, @orientation), rect_color = GraphDataset.to_color(@dataset, @color, scalar1.data_point) do %>
<rect
:if={!is_nil(rect_color)}
fill={rect_color}
height={scalar1.value - scalar2.value}
width={
@dataset.dimensions.width - @dataset.dimensions.margin.left -
@dataset.dimensions.margin.right
}
x={@dataset.dimensions.margin.left}
y={scalar1.value - (scalar1.value - scalar2.value)}
phx-click={
if assigns[:"phx-click"],
do:
JS.push(assigns[:"phx-click"],
value: %{
start_area_point_id: scalar1.data_point.id,
end_area_point_id: scalar2.data_point.id,
dataset_id: @dataset.id,
x_pixel: @dataset.dimensions.margin.left + @dataset.dimensions.width / 2,
y_pixel: scalar2.value + (scalar1.value - scalar2.value) / 2
}
)
}
style={if assigns[:"phx-click"], do: "cursor: pointer;"}
phx-target={assigns[:"phx-target"]}
/>
<% end %>
</g>
"""
end

Expand Down
2 changes: 1 addition & 1 deletion mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule Plox.MixProject do
use Mix.Project

@version "0.3.2"
@version "0.3.3"
@source_url "https://github.com/gridpoint-com/plox"

def project do
Expand Down
Loading