From d9251c7e4ce15f0fbe871aca0a48bad24434523f Mon Sep 17 00:00:00 2001
From: shibao <shibao@bubbletea.dev>
Date: Thu, 23 Mar 2023 00:21:26 -0400
Subject: [PATCH] improve components

---
 .../core_components/toggle_button.html.heex   |  4 ++--
 lib/cannery_web/components/table_component.ex | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/cannery_web/components/core_components/toggle_button.html.heex b/lib/cannery_web/components/core_components/toggle_button.html.heex
index 89ff665..a2d9bb1 100644
--- a/lib/cannery_web/components/core_components/toggle_button.html.heex
+++ b/lib/cannery_web/components/core_components/toggle_button.html.heex
@@ -1,4 +1,4 @@
-<label for={@id || @action} class="inline-flex relative items-center cursor-pointer">
+<label for={@id || @action} class="relative inline-flex items-center cursor-pointer">
   <input
     id={@id || @action}
     type="checkbox"
@@ -23,7 +23,7 @@
   </div>
   <span
     id={"#{@id || @action}-label"}
-    class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300"
+    class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300 whitespace-nowrap"
   >
     <%= render_slot(@inner_block) %>
   </span>
diff --git a/lib/cannery_web/components/table_component.ex b/lib/cannery_web/components/table_component.ex
index 9def80c..facb98e 100644
--- a/lib/cannery_web/components/table_component.ex
+++ b/lib/cannery_web/components/table_component.ex
@@ -135,4 +135,25 @@ defmodule CanneryWeb.Components.TableComponent do
       sort_mode
     )
   end
+
+  @doc """
+  Conditionally composes elements into the columns list, supports maps and
+  lists. Works tail to front in order for efficiency
+
+      iex> []
+      ...> |> maybe_compose_columns(%{label: "Column 3"}, true)
+      ...> |> maybe_compose_columns(%{label: "Column 2"}, false)
+      ...> |> maybe_compose_columns(%{label: "Column 1"})
+      [%{label: "Column 1"}, %{label: "Column 3"}]
+
+  """
+  @spec maybe_compose_columns(list(), element_to_add :: list() | map()) :: list()
+  @spec maybe_compose_columns(list(), element_to_add :: list() | map(), boolean()) :: list()
+  def maybe_compose_columns(columns, element_or_elements, add? \\ true)
+
+  def maybe_compose_columns(columns, elements, true) when is_list(elements),
+    do: Enum.concat(elements, columns)
+
+  def maybe_compose_columns(columns, element, true) when is_map(element), do: [element | columns]
+  def maybe_compose_columns(columns, _element_or_elements, false), do: columns
 end