Merge pull request #669 from woylie/fix/ensure-icon-fun-atoms-exist

fix/ensure icon fun atoms exist

Author: woylie

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ## Unreleased
 
+## [0.14.4] - 2026-04-09
+
+### Fixed
+
+- Fix an issue where the icon function name atoms don't exist yet when the icon
+  component is rendered.
+
 ## [0.14.3] - 2026-04-08
 
 ### Changed

README.md

@@ -16,7 +16,7 @@ The package can be installed by adding `doggo` to your list of dependencies in
 ```elixir
 def deps do
   [
-    {:doggo, "~> 0.14.3"}
+    {:doggo, "~> 0.14.4"}
   ]
 end
 ```

lib/doggo/components/icon.ex

@@ -184,12 +184,38 @@ defmodule Doggo.Components.Icon do
       """
     end
 
-    quote do
-      var!(assigns) =
-        assigns
-        |> var!()
-        |> assign(:icon_module, unquote(icon_module))
-        |> assign(:icon_fun, unquote(icon_fun))
+    if is_nil(icon_fun) do
+      mapping =
+        Map.new(
+          for {name, 1} <- icon_module.__info__(:functions) do
+            {name |> Atom.to_string() |> String.replace("_", "-"), name}
+          end
+        )
+
+      quote do
+        name = String.replace(var!(assigns).name, "_", "-")
+
+        icon_fun =
+          Map.get(unquote(Macro.escape(mapping)), name) ||
+            raise """
+            Unknown icon: #{name}
+            """
+
+        var!(assigns) =
+          assigns
+          |> var!()
+          |> assign(:icon_module, unquote(icon_module))
+          |> assign(:icon_fun, icon_fun)
+          |> assign(:name, nil)
+      end
+    else
+      quote do
+        var!(assigns) =
+          assigns
+          |> var!()
+          |> assign(:icon_module, unquote(icon_module))
+          |> assign(:icon_fun, unquote(icon_fun))
+      end
     end
   end
 
@@ -220,14 +246,6 @@ defmodule Doggo.Components.Icon do
   attr :module, :atom
   attr :fun, :atom
 
-  def dynamic_icon(%{module: module, fun: nil} = assigns)
-      when is_atom(module) do
-    {module, assigns} = Map.pop!(assigns, :module)
-    {name, assigns} = Map.pop!(assigns, :name)
-    name = String.replace(name, "-", "_")
-    apply(module, String.to_existing_atom(name), [assigns])
-  end
-
   def dynamic_icon(%{module: module, fun: fun} = assigns)
       when is_atom(module) and is_atom(fun) do
     {module, assigns} = Map.pop!(assigns, :module)

lib/doggo/macros.ex

@@ -41,6 +41,13 @@ defmodule Doggo.Macros do
       @doc since: unquote(since)
 
       defmacro unquote(builder_name)(opts \\ []) do
+        opts =
+          if Keyword.has_key?(opts, :icon_module) do
+            Keyword.update!(opts, :icon_module, &Macro.expand(&1, __CALLER__))
+          else
+            opts
+          end
+
         module = unquote(module)
         opts = Keyword.validate!(opts, unquote(defaults))
 

mix.exs

@@ -2,7 +2,7 @@ defmodule Doggo.MixProject do
   use Mix.Project
 
   @source_url "https://github.com/woylie/doggo"
-  @version "0.14.3"
+  @version "0.14.4"
 
   def project do
     [

test/doggo/components_test.exs

@@ -7,6 +7,22 @@ defmodule Doggo.ComponentsTest do
   alias Phoenix.LiveView.JS
   alias Phoenix.LiveView.LiveStream
 
+  defmodule Icons do
+    use Phoenix.Component
+
+    def render(assigns) do
+      ~H"""
+      <svg class={@name}></svg>
+      """
+    end
+
+    def info(assigns) do
+      ~H"""
+      <svg class="info"></svg>
+      """
+    end
+  end
+
   defmodule TestComponents do
     @moduledoc """
     Generates components for tests.
@@ -45,10 +61,10 @@ defmodule Doggo.ComponentsTest do
     build_field(gettext_module: Doggo.Gettext)
     build_field_group()
     build_frame()
-    build_icon(icon_module: __MODULE__.Icons)
+    build_icon(icon_module: Doggo.ComponentsTest.Icons)
 
     build_icon(
-      icon_module: __MODULE__.Icons,
+      icon_module: Doggo.ComponentsTest.Icons,
       icon_fun: :render,
       name: :icon_with_fun
     )
@@ -86,22 +102,6 @@ defmodule Doggo.ComponentsTest do
     build_vertical_nav()
     build_vertical_nav_nested()
     build_vertical_nav_section()
-
-    defmodule Icons do
-      use Phoenix.Component
-
-      def render(assigns) do
-        ~H"""
-        <svg class={@name}></svg>
-        """
-      end
-
-      def info(assigns) do
-        ~H"""
-        <svg class="info"></svg>
-        """
-      end
-    end
   end
 
   describe "__dog_components__/0" do

test/doggo/storybook_test.exs

@@ -2,6 +2,22 @@ defmodule Doggo.StorybookTest do
   use ExUnit.Case
   use Phoenix.Component
 
+  defmodule Icons do
+    use Phoenix.Component
+
+    def render(assigns) do
+      ~H"""
+      <svg class={@name}></svg>
+      """
+    end
+
+    def info(assigns) do
+      ~H"""
+      <svg class="info"></svg>
+      """
+    end
+  end
+
   defmodule TestComponents do
     @moduledoc """
     Generates components for tests.
@@ -57,13 +73,13 @@ defmodule Doggo.StorybookTest do
     build_frame()
 
     build_icon(
-      icon_module: __MODULE__.Icons,
+      icon_module: Doggo.StorybookTest.Icons,
       names: ["info"],
       modifiers: [variant: [values: [nil, "yes"], default: nil]]
     )
 
     build_icon(
-      icon_module: __MODULE__.Icons,
+      icon_module: Doggo.StorybookTest.Icons,
       icon_fun: :render,
       names: ["warning"],
       name: :icon_with_fun,
@@ -131,22 +147,6 @@ defmodule Doggo.StorybookTest do
     build_vertical_nav(
       modifiers: [variant: [values: [nil, "yes"], default: nil]]
     )
-
-    defmodule Icons do
-      use Phoenix.Component
-
-      def render(assigns) do
-        ~H"""
-        <svg class={@name}></svg>
-        """
-      end
-
-      def info(assigns) do
-        ~H"""
-        <svg class="info"></svg>
-        """
-      end
-    end
   end
 
   for {name, info} <- TestComponents.__dog_components__() do