From 7a37b11abe484a3e5cf669e67a042d4afc961a84 Mon Sep 17 00:00:00 2001 From: Jonathan Gao Date: Fri, 15 Apr 2022 17:17:55 +0800 Subject: [PATCH] fix: Format code. --- lib/phoenix_webcomponent.ex | 5 ++++- lib/phoenix_webcomponent/engine.ex | 5 ++++- lib/phoenix_webcomponent/form.ex | 1 + lib/phoenix_webcomponent/form_data.ex | 6 ++++-- lib/phoenix_webcomponent/link.ex | 5 ++++- test/phoenix_html/engine_test.exs | 11 +++++++++-- test/phoenix_html/form_test.exs | 5 ++++- 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/lib/phoenix_webcomponent.ex b/lib/phoenix_webcomponent.ex index b7d8fa8f..cc7bf598 100644 --- a/lib/phoenix_webcomponent.ex +++ b/lib/phoenix_webcomponent.ex @@ -324,7 +324,10 @@ defmodule Phoenix.WebComponent do defp attr_escape({:safe, data}), do: data defp attr_escape(nil), do: [] - defp attr_escape(other) when is_binary(other), do: Phoenix.WebComponent.Engine.encode_to_iodata!(other) + + defp attr_escape(other) when is_binary(other), + do: Phoenix.WebComponent.Engine.encode_to_iodata!(other) + defp attr_escape(other), do: Phoenix.WebComponent.Safe.to_iodata(other) @doc """ diff --git a/lib/phoenix_webcomponent/engine.ex b/lib/phoenix_webcomponent/engine.ex index 5f001841..3f13529b 100644 --- a/lib/phoenix_webcomponent/engine.ex +++ b/lib/phoenix_webcomponent/engine.ex @@ -21,7 +21,10 @@ defmodule Phoenix.WebComponent.Engine do def encode_to_iodata!({:safe, body}), do: body def encode_to_iodata!(nil), do: "" def encode_to_iodata!(bin) when is_binary(bin), do: html_escape(bin) - def encode_to_iodata!(list) when is_list(list), do: Phoenix.WebComponent.Safe.List.to_iodata(list) + + def encode_to_iodata!(list) when is_list(list), + do: Phoenix.WebComponent.Safe.List.to_iodata(list) + def encode_to_iodata!(other), do: Phoenix.WebComponent.Safe.to_iodata(other) @doc false diff --git a/lib/phoenix_webcomponent/form.ex b/lib/phoenix_webcomponent/form.ex index fc980782..d2bfbef0 100644 --- a/lib/phoenix_webcomponent/form.ex +++ b/lib/phoenix_webcomponent/form.ex @@ -663,6 +663,7 @@ defmodule Phoenix.WebComponent.Form do """ def wc_textarea(form, field, opts \\ []) do {value, opts} = Keyword.pop(opts, :value, input_value(form, field)) + opts = opts |> Keyword.put_new(:id, input_id(form, field)) diff --git a/lib/phoenix_webcomponent/form_data.ex b/lib/phoenix_webcomponent/form_data.ex index 70617b43..18622200 100644 --- a/lib/phoenix_webcomponent/form_data.ex +++ b/lib/phoenix_webcomponent/form_data.ex @@ -37,14 +37,16 @@ defprotocol Phoenix.WebComponent.FormData do Returns the HTML5 validations that would apply to the given field. """ - @spec input_validations(t, Phoenix.WebComponent.Form.t(), Phoenix.WebComponent.Form.field()) :: Keyword.t() + @spec input_validations(t, Phoenix.WebComponent.Form.t(), Phoenix.WebComponent.Form.field()) :: + Keyword.t() def input_validations(data, form, field) @doc """ Receives the given field and returns its input type (:text_input, :select, etc). Returns `nil` if the type is unknown. """ - @spec input_type(t, Phoenix.WebComponent.Form.t(), Phoenix.WebComponent.Form.field()) :: atom | nil + @spec input_type(t, Phoenix.WebComponent.Form.t(), Phoenix.WebComponent.Form.field()) :: + atom | nil def input_type(data, form, field) end diff --git a/lib/phoenix_webcomponent/link.ex b/lib/phoenix_webcomponent/link.ex index 1934e028..df5061d6 100644 --- a/lib/phoenix_webcomponent/link.ex +++ b/lib/phoenix_webcomponent/link.ex @@ -83,7 +83,10 @@ defmodule Phoenix.WebComponent.Link do else {csrf_token, opts} = Keyword.pop(opts, :csrf_token, true) opts = Keyword.put_new(opts, :rel, "nofollow") - [data: data] = Phoenix.WebComponent.link_attributes(to, method: method, csrf_token: csrf_token) + + [data: data] = + Phoenix.WebComponent.link_attributes(to, method: method, csrf_token: csrf_token) + content_tag(:a, text, [data: data, href: data[:to]] ++ opts) end end diff --git a/test/phoenix_html/engine_test.exs b/test/phoenix_html/engine_test.exs index 7d4fad09..7a773b80 100644 --- a/test/phoenix_html/engine_test.exs +++ b/test/phoenix_html/engine_test.exs @@ -5,7 +5,11 @@ defmodule Phoenix.WebComponent.EngineTest do def unsafe(do: {:safe, content}), do: content test "encode_to_iodata!" do - assert Phoenix.WebComponent.Engine.encode_to_iodata!("") == [[[] | "<"], "foo" | ">"] + assert Phoenix.WebComponent.Engine.encode_to_iodata!("") == [ + [[] | "<"], + "foo" | ">" + ] + assert Phoenix.WebComponent.Engine.encode_to_iodata!({:safe, ""}) == "" assert Phoenix.WebComponent.Engine.encode_to_iodata!(123) == "123" end @@ -71,7 +75,10 @@ defmodule Phoenix.WebComponent.EngineTest do defp eval(string, assigns \\ %{}) do {:safe, io} = - EEx.eval_string(string, [assigns: assigns], file: __ENV__.file, engine: Phoenix.WebComponent.Engine) + EEx.eval_string(string, [assigns: assigns], + file: __ENV__.file, + engine: Phoenix.WebComponent.Engine + ) IO.iodata_to_binary(io) end diff --git a/test/phoenix_html/form_test.exs b/test/phoenix_html/form_test.exs index 65131ca3..c8ec1a11 100644 --- a/test/phoenix_html/form_test.exs +++ b/test/phoenix_html/form_test.exs @@ -426,7 +426,10 @@ defmodule Phoenix.WebComponent.FormTest do end test "generates hidden fields for lists from the given form" do - form = %{Phoenix.WebComponent.FormData.to_form(conn(), []) | hidden: [field: ["a", "b", "c"]]} + form = %{ + Phoenix.WebComponent.FormData.to_form(conn(), []) + | hidden: [field: ["a", "b", "c"]] + } assert hidden_inputs_for(form) == [