improved unique_variation_id issues & tests

CHANGELOG.md

@@ -1,8 +1,9 @@
 # CHANGELOG
 
-## v0.4.5 (not released)
+## v0.4.5 (2022-10-10)
 
-- **bugfix**: `TemplateHelpers.unique_variation_id/2` raises in playground.
+- **bugfix**: `TemplateHelpers.unique_variation_id/2` raises in playground if component has an `id` attr.
+- **bugfix**: fixed some dialyxir warnings
 
 ## v0.4.4 (2022-10-10)
 

lib/phx_live_storybook/helpers/template_helpers.ex

@@ -25,6 +25,10 @@ defmodule PhxLiveStorybook.TemplateHelpers do
     end)
   end
 
+  def unique_variation_id(story, {:single, variation_id}) do
+    unique_variation_id(story, variation_id)
+  end
+
   def unique_variation_id(story, {group_id, variation_id}) do
     unique_variation_id(story, "#{group_id}-#{variation_id}")
   end

lib/phx_live_storybook/rendering/code_renderer.ex

@@ -44,7 +44,7 @@ defmodule PhxLiveStorybook.Rendering.CodeRenderer do
                 component_code_heex(
                   context.story,
                   fun_or_mod,
-                  strip_attributes(context.story, v),
+                  strip_attributes(context.story, context.group_id, v),
                   v.let,
                   v.slots,
                   context.template
@@ -61,7 +61,7 @@ defmodule PhxLiveStorybook.Rendering.CodeRenderer do
                 component_code_heex(
                   context.story,
                   fun_or_mod,
-                  strip_attributes(context.story, v),
+                  strip_attributes(context.story, context.group_id, v),
                   v.let,
                   v.slots,
                   context.template
@@ -233,9 +233,9 @@ defmodule PhxLiveStorybook.Rendering.CodeRenderer do
 
   # If :id is a declared attribute, it is important enough to be shown as component markup.
   # Otherwise, we keep it hidden.
-  defp strip_attributes(story, %RenderingVariation{id: v_id, attributes: attributes}) do
+  defp strip_attributes(story, group_id, %RenderingVariation{id: v_id, attributes: attributes}) do
     if Enum.any?(story.merged_attributes(), &(&1.id == :id)) do
-      Map.put(attributes, :id, TemplateHelpers.unique_variation_id(story, v_id))
+      Map.put(attributes, :id, TemplateHelpers.unique_variation_id(story, {group_id, v_id}))
     else
       Map.delete(attributes, :id)
     end

mix.exs

@@ -1,7 +1,7 @@
 defmodule PhxLiveStorybook.MixProject do
   use Mix.Project
 
-  @version "0.4.4"
+  @version "0.4.5"
 
   def project do
     [

test/fixtures/storybook_content/tree/component.story.exs

@@ -6,6 +6,10 @@ defmodule TreeStorybook.Component do
 
   def attributes do
     [
+      %Attr{
+        id: :id,
+        type: :string
+      },
       %Attr{
         id: :label,
         type: :string,

test/phx_live_storybook/rendering/code_renderer_test.exs

@@ -23,10 +23,10 @@ defmodule PhxLiveStorybook.Rendering.CodeRendererTest do
       live_component: live_component
     } do
       code = render_variation_code(component, :hello)
-      assert code =~ ~s|<.component label="hello"/>|
+      assert code =~ ~s|<.component id="component-hello" label="hello"/>|
 
       code = render_variation_code(component, :world)
-      assert code =~ ~s|<.component index={37} label="world"/>|
+      assert code =~ ~s|<.component id="component-world" index={37} label="world"/>|
 
       code = render_variation_code(live_component, :hello)
       assert code =~ ~s|<.live_component module={LiveComponent} label="hello"/>|