fix: A1-9 replace native color input with 17-preset colour picker popover + custom hex
This commit is contained in:
@@ -16,6 +16,16 @@ defmodule BDS.Desktop.ShellLive.TagsEditor do
|
||||
|
||||
@tags_sections ~w(cloud manage merge)
|
||||
|
||||
@colour_presets ~w(
|
||||
#ef4444 #f97316 #f59e0b #eab308 #84cc16
|
||||
#22c55e #10b981 #14b8a6 #06b6d4 #0ea5e9
|
||||
#3b82f6 #6366f1 #8b5cf6 #a855f7 #d946ef
|
||||
#ec4899 #64748b
|
||||
)
|
||||
|
||||
@spec colour_presets() :: [String.t()]
|
||||
def colour_presets, do: @colour_presets
|
||||
|
||||
@spec update(map(), Phoenix.LiveView.Socket.t()) :: {:ok, Phoenix.LiveView.Socket.t()}
|
||||
@impl true
|
||||
def update(%{action: :save} = assigns, socket) do
|
||||
@@ -107,6 +117,26 @@ defmodule BDS.Desktop.ShellLive.TagsEditor do
|
||||
{:noreply, assign(socket, :tags_editor, tags_editor)}
|
||||
end
|
||||
|
||||
def handle_event("pick_new_tag_color", %{"color" => color}, socket) do
|
||||
tags_editor =
|
||||
Map.put(socket.assigns.tags_editor, :new_tag, %{
|
||||
socket.assigns.tags_editor.new_tag
|
||||
| "color" => color
|
||||
})
|
||||
|
||||
{:noreply, assign(socket, :tags_editor, tags_editor)}
|
||||
end
|
||||
|
||||
def handle_event("pick_edit_tag_color", %{"color" => color}, socket) do
|
||||
tags_editor =
|
||||
Map.put(socket.assigns.tags_editor, :edit_draft, %{
|
||||
socket.assigns.tags_editor.edit_draft
|
||||
| "color" => color
|
||||
})
|
||||
|
||||
{:noreply, assign(socket, :tags_editor, tags_editor)}
|
||||
end
|
||||
|
||||
def handle_event("save_tag_editor", _params, socket) do
|
||||
{:noreply, do_save(socket)}
|
||||
end
|
||||
@@ -241,6 +271,55 @@ defmodule BDS.Desktop.ShellLive.TagsEditor do
|
||||
end
|
||||
end
|
||||
|
||||
attr :color, :string, default: nil
|
||||
attr :presets, :list, required: true
|
||||
attr :pick_event, :string, required: true
|
||||
attr :target, :any, required: true
|
||||
|
||||
defp colour_picker(assigns) do
|
||||
~H"""
|
||||
<div
|
||||
class="colour-picker-wrap"
|
||||
id={"cp-#{@pick_event}"}
|
||||
phx-hook="ColourPicker"
|
||||
data-pick-event={@pick_event}
|
||||
data-target={if @target, do: @target.cid}
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
class="colour-picker-trigger"
|
||||
style={"background-color: #{if @color in [nil, ""], do: "#3b82f6", else: @color}"}
|
||||
phx-click={Phoenix.LiveView.JS.toggle(to: "#cp-#{@pick_event} .colour-picker-popover")}
|
||||
/>
|
||||
<div class="colour-picker-popover hidden">
|
||||
<div class="colour-picker-grid">
|
||||
<%= for preset <- @presets do %>
|
||||
<button
|
||||
type="button"
|
||||
class={"colour-picker-swatch#{if normalize_hex(@color) == normalize_hex(preset), do: " selected", else: ""}"}
|
||||
style={"background-color: #{preset}"}
|
||||
phx-click={Phoenix.LiveView.JS.push(@pick_event, value: %{color: preset}, target: if(@target, do: @target.cid)) |> Phoenix.LiveView.JS.add_class("hidden", to: "#cp-#{@pick_event} .colour-picker-popover")}
|
||||
/>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="colour-picker-custom">
|
||||
<label>#</label>
|
||||
<input
|
||||
type="text"
|
||||
maxlength="7"
|
||||
placeholder="RRGGBB"
|
||||
value={if @color in [nil, ""], do: "", else: @color}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
"""
|
||||
end
|
||||
|
||||
defp normalize_hex(nil), do: nil
|
||||
defp normalize_hex(""), do: nil
|
||||
defp normalize_hex(hex), do: String.downcase(hex)
|
||||
|
||||
defp load_data(socket) do
|
||||
project_id = socket.assigns.project_id
|
||||
|
||||
@@ -280,7 +359,8 @@ defmodule BDS.Desktop.ShellLive.TagsEditor do
|
||||
merge_target:
|
||||
Map.get(socket.assigns, :tags_editor, %{})
|
||||
|> Map.get(:merge_target, List.first(selected) || ""),
|
||||
selected_section: selected_section
|
||||
selected_section: selected_section,
|
||||
colour_presets: @colour_presets
|
||||
}
|
||||
|
||||
assign(socket, :tags_editor, data)
|
||||
|
||||
@@ -38,7 +38,13 @@
|
||||
<form class="tag-create-form" phx-change="change_new_tag_editor" phx-target={@myself}>
|
||||
<div class="tag-form-row flex flex-wrap items-center gap-3">
|
||||
<input class="ui-input" type="text" name="new_tag[name]" value={@tags_editor.new_tag["name"]} placeholder={dgettext("ui", "Tag name")} />
|
||||
<input type="color" name="new_tag[color]" value={if(@tags_editor.new_tag["color"] in [nil, ""], do: "#3b82f6", else: @tags_editor.new_tag["color"])} />
|
||||
<input type="hidden" name="new_tag[color]" value={@tags_editor.new_tag["color"] || ""} />
|
||||
<.colour_picker
|
||||
color={@tags_editor.new_tag["color"]}
|
||||
presets={@tags_editor.colour_presets}
|
||||
pick_event="pick_new_tag_color"
|
||||
target={@myself}
|
||||
/>
|
||||
<button class="primary ui-button ui-button-primary" type="button" phx-click="create_tag_editor" phx-target={@myself}><%= dgettext("ui", "Create") %></button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -47,7 +53,13 @@
|
||||
<form class="tag-edit-form" phx-change="change_edit_tag_editor" phx-target={@myself}>
|
||||
<div class="tag-form-row flex flex-wrap items-center gap-3">
|
||||
<input class="ui-input" type="text" name="edit_tag[name]" value={@tags_editor.edit_draft["name"]} />
|
||||
<input type="color" name="edit_tag[color]" value={if(@tags_editor.edit_draft["color"] in [nil, ""], do: "#3b82f6", else: @tags_editor.edit_draft["color"])} />
|
||||
<input type="hidden" name="edit_tag[color]" value={@tags_editor.edit_draft["color"] || ""} />
|
||||
<.colour_picker
|
||||
color={@tags_editor.edit_draft["color"]}
|
||||
presets={@tags_editor.colour_presets}
|
||||
pick_event="pick_edit_tag_color"
|
||||
target={@myself}
|
||||
/>
|
||||
<select class="ui-input" name="edit_tag[post_template_slug]">
|
||||
<option value=""><%= dgettext("ui", "No Template") %></option>
|
||||
<%= for template <- @tags_editor.templates do %>
|
||||
|
||||
Reference in New Issue
Block a user