"""
end
@@ -166,7 +166,7 @@ defmodule PetalComponents.Typography do
def ol(assigns) do
~H"""
- <%= render_slot(@inner_block) %>
+ {render_slot(@inner_block)}
"""
end
diff --git a/lib/petal_components/user_dropdown_menu.ex b/lib/petal_components/user_dropdown_menu.ex
index f728123d..426aa472 100644
--- a/lib/petal_components/user_dropdown_menu.ex
+++ b/lib/petal_components/user_dropdown_menu.ex
@@ -35,18 +35,18 @@ defmodule PetalComponents.UserDropdownMenu do
>
<%= cond do %>
<% is_function(menu_item.icon) -> %>
- <%= Phoenix.LiveView.TagEngine.component(
+ {Phoenix.LiveView.TagEngine.component(
menu_item.icon,
[class: "w-5 h-5 text-gray-500 dark:text-gray-400"],
{__ENV__.module, __ENV__.function, __ENV__.file, __ENV__.line}
- ) %>
+ )}
<% is_binary(menu_item.icon) && String.match?(menu_item.icon, ~r/svg|img/) -> %>
- <%= Phoenix.HTML.raw(menu_item.icon) %>
+ {Phoenix.HTML.raw(menu_item.icon)}
<% true -> %>
<.icon name={menu_item.icon} class="w-5 h-5 text-gray-500 dark:text-gray-400" />
<% end %>
- <%= menu_item.label %>
+ {menu_item.label}
<% end %>
diff --git a/lib/petal_components_web/a11y_live.ex b/lib/petal_components_web/a11y_live.ex
index 64deff5b..325d8f6d 100644
--- a/lib/petal_components_web/a11y_live.ex
+++ b/lib/petal_components_web/a11y_live.ex
@@ -274,7 +274,7 @@ defmodule PetalComponentsWeb.A11yLive do
<.table class="my-class" id="posts" row_id={fn post -> "row_#{post.id}" end} rows={@posts}>
- <:col :let={post} label="Name" class="col-class" row_class="row-class"><%= post.name %>
+ <:col :let={post} label="Name" class="col-class" row_class="row-class">{post.name}
<.tabs class="flex-col sm:flex-row space-x">
diff --git a/mix.exs b/mix.exs
index 1f35d970..7da1d02f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -49,9 +49,9 @@ defmodule PetalComponents.MixProject do
{:wallaby, "~> 0.30.9", runtime: false, only: :test},
{:phoenix, "~> 1.7"},
{:phoenix_live_view, "~> 1.0"},
- {:phoenix_html, "~> 4.0"},
+ {:phoenix_html, "~> 4.1"},
{:phoenix_html_helpers, "~> 1.0"},
- {:jason, "~> 1.0", only: [:dev, :test]},
+ {:jason, "~> 1.2", only: [:dev, :test]},
{:ex_doc, "~> 0.24", only: :dev, runtime: false},
{:phoenix_ecto, "~> 4.4"},
{:credo, "~> 1.7", only: [:dev, :test], runtime: false},
diff --git a/test/petal/accordion_test.exs b/test/petal/accordion_test.exs
index 59c9755e..716b84cc 100644
--- a/test/petal/accordion_test.exs
+++ b/test/petal/accordion_test.exs
@@ -90,7 +90,7 @@ defmodule PetalComponents.AccordionTest do
html =
rendered_to_string(~H"""
<.accordion entries={@entries}>
- <:item :let={entry}><%= entry.content %>
+ <:item :let={entry}>{entry.content}
""")
diff --git a/test/petal/field_test.exs b/test/petal/field_test.exs
index 68bdf270..751b1ac9 100644
--- a/test/petal/field_test.exs
+++ b/test/petal/field_test.exs
@@ -27,7 +27,6 @@ defmodule PetalComponents.FieldTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
refute html =~ " disabled "
assert html =~ "pc-text-input"
assert html =~ "!w-max"
@@ -36,7 +35,7 @@ defmodule PetalComponents.FieldTest do
assert html =~ "label-class"
end
- test "field as text with field errors" do
+ test "Unedited field as text with field errors" do
assigns = %{
field: %Phoenix.HTML.FormField{
errors: [
@@ -47,7 +46,38 @@ defmodule PetalComponents.FieldTest do
value: "",
field: :name,
id: "name",
- form: %Phoenix.HTML.Form{}
+ form: %Phoenix.HTML.Form{
+ params: %{"_unused_name" => ""}
+ }
+ }
+ }
+
+ html =
+ rendered_to_string(~H"""
+ <.field field={@field} />
+ """)
+
+ assert html =~ "name"
+ assert html =~ "Name"
+ refute html =~ "pc-form-field-error"
+ refute html =~ html_escape("can't be blank")
+ refute html =~ html_escape("too short!")
+ end
+
+ test "Edited field as text with field errors" do
+ assigns = %{
+ field: %Phoenix.HTML.FormField{
+ errors: [
+ {"can't be blank", [validation: :required]},
+ {"too short!", [validation: :length]}
+ ],
+ name: "name",
+ value: "",
+ field: :name,
+ id: "name",
+ form: %Phoenix.HTML.Form{
+ params: %{"name" => ""}
+ }
}
}
@@ -157,7 +187,6 @@ defmodule PetalComponents.FieldTest do
assert html =~ "checkbox"
assert html =~ "user[read_terms]"
- assert html =~ "phx-feedback-for"
assert html =~ "itemid"
# It includes a hidden field for when the switch is not checked
@@ -185,7 +214,6 @@ defmodule PetalComponents.FieldTest do
assert html =~ "itemid"
assert html =~ " ""}
}
}
>
@@ -231,11 +224,72 @@ defmodule PetalComponents.FormTest do
""")
assert html =~ "pc-form-field-error"
- assert html =~ "phx-feedback-for"
assert html =~ "blank"
assert html =~ "too long"
end
+ test "Unedited form_field with error does not show errors" do
+ assigns = %{}
+
+ html =
+ rendered_to_string(~H"""
+ <.form
+ :let={f}
+ as={:user}
+ for={
+ %Ecto.Changeset{
+ action: :update,
+ data: %{password: ""},
+ errors: [
+ password: {"can't be blank", [validation: :required]}
+ ],
+ # Simulate user only interacted with email field
+ params: %{
+ "_unused_password" => ""
+ }
+ }
+ }
+ >
+ <.form_field type="password_input" form={f} field={:password} />
+
+ """)
+
+ # Password field (unused) should not show error
+ refute html =~ "has-error"
+ refute html =~ "can't be blank"
+ end
+
+ test "Edited form_field with error shows errors" do
+ assigns = %{}
+
+ html =
+ rendered_to_string(~H"""
+ <.form
+ :let={f}
+ as={:user}
+ for={
+ %Ecto.Changeset{
+ action: :update,
+ data: %{password: ""},
+ errors: [
+ password: {"can't be blank", [validation: :required]}
+ ],
+ # Simulate user only interacted with email field
+ params: %{
+ "password" => ""
+ }
+ }
+ }
+ >
+ <.form_field type="password_input" form={f} field={:password} />
+
+ """)
+
+ # Password field (unused) should not show error
+ assert html =~ "has-error"
+ assert html =~ "can't be blank"
+ end
+
test "form_help_text" do
assigns = %{}
@@ -284,7 +338,8 @@ defmodule PetalComponents.FormTest do
errors: [
name: {"can't be blank", [validation: :required]},
name: {"too long", [validation: :required]}
- ]
+ ],
+ params: %{"name" => ""}
}
}
>
@@ -305,7 +360,7 @@ defmodule PetalComponents.FormTest do
assert html =~ "John"
assert html =~ "too long"
assert html =~ "blank"
- assert html =~ "
"
+ assert html =~ "
"
assert html =~ "Help!"
end
@@ -337,7 +392,8 @@ defmodule PetalComponents.FormTest do
errors: [
name: {"can't be blank", [validation: :required]},
name: {"too long", [validation: :required]}
- ]
+ ],
+ params: %{"name" => ""}
}
}
>
@@ -532,7 +588,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "email_input" do
@@ -550,7 +605,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "password_input" do
@@ -568,7 +622,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "search_input" do
@@ -586,7 +639,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "telephone_input" do
@@ -604,7 +656,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "url_input" do
@@ -622,7 +673,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "time_input" do
@@ -640,7 +690,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "time_select" do
@@ -672,7 +721,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "datetime_select" do
@@ -718,7 +766,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "color_input" do
@@ -736,7 +783,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "file_input" do
@@ -755,7 +801,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "itemid"
assert html =~ "something"
assert html =~ "pc-file-input"
- assert html =~ "phx-feedback-for"
end
test "range_input" do
@@ -773,7 +818,6 @@ defmodule PetalComponents.FormTest do
assert html =~ "user[name]"
assert html =~ "itemid"
assert html =~ "something"
- assert html =~ "phx-feedback-for"
end
test "hidden_input" do
diff --git a/test/petal/marquee_test.exs b/test/petal/marquee_test.exs
index f7fac36c..bd48fc60 100644
--- a/test/petal/marquee_test.exs
+++ b/test/petal/marquee_test.exs
@@ -12,7 +12,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -31,7 +31,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee repeat={3}>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -49,7 +49,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee repeat={0}>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -68,7 +68,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee vertical>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -89,7 +89,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee pause_on_hover>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -106,7 +106,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee reverse>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -123,7 +123,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee duration="50s" gap="2rem">
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -143,7 +143,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -161,7 +161,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee vertical>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -179,7 +179,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee overlay_gradient={false}>
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -198,7 +198,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee max_width="xl">
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -215,7 +215,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee max_height="lg">
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -234,7 +234,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee class="custom-class">
<%= for item <- @items do %>
-
<%= item %>
+
{item}
<% end %>
""")
@@ -251,7 +251,7 @@ defmodule PetalComponents.MarqueeTest do
rendered_to_string(~H"""
<.marquee data-test="marquee">
<%= for item <- @items do %>
-