Skip to content
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

Allow keyword list options to use nil as key and/or value #456

Merged
merged 2 commits into from
Jan 23, 2025
Merged

Allow keyword list options to use nil as key and/or value #456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ce67bf
Allow keyword list options to use nil as key and/or value
LostKobrakai Jan 22, 2025
06f8dcb
Switch to phoenix_html
LostKobrakai Jan 23, 2025
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
13 changes: 7 additions & 6 deletions lib/phoenix_html/form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,17 +334,18 @@ defmodule Phoenix.HTML.Form do
[acc | option(option_key, option_value, [], selected_values)]

options, acc when is_list(options) ->
{option_key, options} = Keyword.pop(options, :key)

option_key ||
if not Keyword.has_key?(options, :key) do
raise ArgumentError,
"expected :key key when building <option> from keyword list: #{inspect(options)}"
end

{option_value, options} = Keyword.pop(options, :value)

option_value ||
if not Keyword.has_key?(options, :value) do
LostKobrakai marked this conversation as resolved.
Show resolved Hide resolved
raise ArgumentError,
"expected :value key when building <option> from keyword list: #{inspect(options)}"
end

{option_key, options} = Keyword.pop(options, :key)
{option_value, options} = Keyword.pop(options, :value)

[acc | option(option_key, option_value, options, selected_values)]

Expand Down
11 changes: 7 additions & 4 deletions test/phoenix_html/form_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,10 @@ defmodule Phoenix.HTML.FormTest do

describe "options_for_select/2" do
test "simple" do
assert options_for_select(~w(value novalue), "novalue") |> safe_to_string() ==
assert options_for_select(["value", "novalue", nil], "novalue") |> safe_to_string() ==
~s(<option value="value">value</option>) <>
~s(<option selected value="novalue">novalue</option>)
~s(<option selected value="novalue">novalue</option>) <>
~s(<option value=""></option>)

assert options_for_select(["value", :hr, "novalue"], "novalue") |> safe_to_string() ==
~s(<option value="value">value</option>) <>
Expand All @@ -261,14 +262,16 @@ defmodule Phoenix.HTML.FormTest do
[
[value: "value", key: "Value", disabled: true],
:hr,
[value: "novalue", key: "No Value"]
[value: "novalue", key: "No Value"],
[value: nil, key: nil]
],
"novalue"
)
|> safe_to_string() ==
~s(<option disabled value="value">Value</option>) <>
~s(<hr/>) <>
~s(<option selected value="novalue">No Value</option>)
~s(<option selected value="novalue">No Value</option>) <>
~s(<option value=""></option>)

assert options_for_select(~w(value novalue), ["value", "novalue"]) |> safe_to_string() ==
~s(<option selected value="value">value</option>) <>
Expand Down
Loading