Merge remote-tracking branch 'origin/main' into feature/accessibility…

…-hook
bluzky · Dec 8, 2024 · fce00ef · fce00ef
2 parents 2ef5118 + f72ec0a
commit fce00ef
Show file tree

Hide file tree

Showing 34 changed files with 149 additions and 145 deletions.
diff --git a/README.md b/README.md
@@ -141,9 +141,11 @@ It's also important to note that you must format your code with `mix format` bef
 - ✅ Dropdown Menu
 - ✅ Form
 - ✅ Hover Card
+- ✅ Icon
 - ✅ Input
 - [ ] Input OTP
 - ✅ Label
+- ✅ Menu
 - ✅ Pagination
 - ✅ Popover
 - ✅ Progress
@@ -159,9 +161,9 @@ It's also important to note that you must format your code with `mix format` bef
 - ✅ Table
 - ✅ Tabs
 - ✅ Textarea
-- ✅ Tooltip
 - ✅ Toggle
 - ✅ Toggle Group
+- ✅ Tooltip
 
 ## 🌟 Contributors
 

diff --git a/lib/mix/tasks/salad.init.ex b/lib/mix/tasks/salad.init.ex
@@ -51,7 +51,7 @@ defmodule Mix.Tasks.Salad.Init do
          :ok <- maybe_write_component_module(component_path, app_name, opts),
          :ok <- install_node_dependencies(node_opts) do
       if opts[:as_lib] do
-        Mix.shell().info("Done. Now you can use any component by importSaladUI.<ComponentName> in your project.")
+        Mix.shell().info("Done. Now you can use any component by `import SaladUI.<ComponentName>` in your project.")
       else
         Mix.shell().info("Done. Now you can add components by running mix salad.add <component_name>")
       end

diff --git a/lib/salad_ui/accordion.ex b/lib/salad_ui/accordion.ex
@@ -39,7 +39,7 @@ defmodule SaladUI.Accordion do
   def accordion(assigns) do
     ~H"""
     <div class={classes(["", @class])}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -50,7 +50,7 @@ defmodule SaladUI.Accordion do
   def accordion_item(assigns) do
     ~H"""
     <div class={classes(["border-b", @class])}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -70,7 +70,7 @@ defmodule SaladUI.Accordion do
         ])
       }>
         <p class="font-medium">
-          <%= render_slot(@inner_block) %>
+          {render_slot(@inner_block)}
         </p>
 
         <svg
@@ -100,7 +100,7 @@ defmodule SaladUI.Accordion do
     <div class="text-sm overflow-hidden grid grid-rows-[0fr] transition-[grid-template-rows] duration-300 peer-open/accordion:grid-rows-[1fr]">
       <div class="overflow-hidden">
         <div class={classes(["pb-4 pt-0", @class])}>
-          <%= render_slot(@inner_block) %>
+          {render_slot(@inner_block)}
         </div>
       </div>
     </div>

diff --git a/lib/salad_ui/alert.ex b/lib/salad_ui/alert.ex
@@ -32,7 +32,7 @@ defmodule SaladUI.Alert do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -55,7 +55,7 @@ defmodule SaladUI.Alert do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </h5>
     """
   end
@@ -78,7 +78,7 @@ defmodule SaladUI.Alert do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end

diff --git a/lib/salad_ui/alert_dialog.ex b/lib/salad_ui/alert_dialog.ex
@@ -46,7 +46,7 @@ defmodule SaladUI.AlertDialog do
       class="inline-block relative"
       id={@id}
     >
-      <%= render_slot(@inner_block, @builder) %>
+      {render_slot(@inner_block, @builder)}
     </div>
     """
   end
@@ -69,7 +69,7 @@ defmodule SaladUI.AlertDialog do
         ])
       }
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -98,7 +98,7 @@ defmodule SaladUI.AlertDialog do
           }
           {@rest}
         >
-          <%= render_slot(@inner_block) %>
+          {render_slot(@inner_block)}
         </div>
       </div>
     </div>
@@ -123,7 +123,7 @@ defmodule SaladUI.AlertDialog do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -146,7 +146,7 @@ defmodule SaladUI.AlertDialog do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </h2>
     """
   end
@@ -169,7 +169,7 @@ defmodule SaladUI.AlertDialog do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </p>
     """
   end
@@ -192,7 +192,7 @@ defmodule SaladUI.AlertDialog do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -220,7 +220,7 @@ defmodule SaladUI.AlertDialog do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </button>
     """
   end
@@ -245,7 +245,7 @@ defmodule SaladUI.AlertDialog do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </button>
     """
   end

diff --git a/lib/salad_ui/avatar.ex b/lib/salad_ui/avatar.ex
@@ -12,7 +12,7 @@ defmodule SaladUI.Avatar do
       class={classes(["relative h-10 w-10 shrink-0 overflow-hidden rounded-full", @class])}
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </span>
     """
   end
@@ -44,7 +44,7 @@ defmodule SaladUI.Avatar do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </span>
     """
   end

diff --git a/lib/salad_ui/badge.ex b/lib/salad_ui/badge.ex
@@ -34,7 +34,7 @@ defmodule SaladUI.Badge do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end

diff --git a/lib/salad_ui/breadcrumb.ex b/lib/salad_ui/breadcrumb.ex
@@ -41,7 +41,7 @@ defmodule SaladUI.Breadcrumb do
       {@rest}
       }
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </nav>
     """
   end
@@ -65,7 +65,7 @@ defmodule SaladUI.Breadcrumb do
       {@rest}
       }
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </ol>
     """
   end
@@ -88,7 +88,7 @@ defmodule SaladUI.Breadcrumb do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </li>
     """
   end
@@ -111,7 +111,7 @@ defmodule SaladUI.Breadcrumb do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </.link>
     """
   end
@@ -137,7 +137,7 @@ defmodule SaladUI.Breadcrumb do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </span>
     """
   end

diff --git a/lib/salad_ui/button.ex b/lib/salad_ui/button.ex
@@ -37,7 +37,7 @@ defmodule SaladUI.Button do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </button>
     """
   end

diff --git a/lib/salad_ui/card.ex b/lib/salad_ui/card.ex
@@ -30,7 +30,7 @@ defmodule SaladUI.Card do
   def card(assigns) do
     ~H"""
     <div class={classes(["rounded-xl border bg-card text-card-foreground shadow", @class])} {@rest}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -42,7 +42,7 @@ defmodule SaladUI.Card do
   def card_header(assigns) do
     ~H"""
     <div class={classes(["flex flex-col space-y-1.5 p-6", @class])} {@rest}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -54,7 +54,7 @@ defmodule SaladUI.Card do
   def card_title(assigns) do
     ~H"""
     <h3 class={classes(["text-2xl font-semibold leading-none tracking-tight", @class])} {@rest}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </h3>
     """
   end
@@ -66,7 +66,7 @@ defmodule SaladUI.Card do
   def card_description(assigns) do
     ~H"""
     <p class={classes(["text-sm text-muted-foreground", @class])} {@rest}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </p>
     """
   end
@@ -78,7 +78,7 @@ defmodule SaladUI.Card do
   def card_content(assigns) do
     ~H"""
     <div class={classes(["p-6 pt-0", @class])} {@rest}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -90,7 +90,7 @@ defmodule SaladUI.Card do
   def card_footer(assigns) do
     ~H"""
     <div class={classes(["flex items-center justify-between p-6 pt-0 ", @class])} {@rest}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end

diff --git a/lib/salad_ui/collapsible.ex b/lib/salad_ui/collapsible.ex
@@ -43,7 +43,7 @@ defmodule SaladUI.Collapsible do
       id={@id}
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
@@ -59,7 +59,7 @@ defmodule SaladUI.Collapsible do
   def collapsible_trigger(assigns) do
     ~H"""
     <.dynamic tag={@as_tag} data-part="trigger" class={@class} {@rest}>
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </.dynamic>
     """
   end
@@ -83,7 +83,7 @@ defmodule SaladUI.Collapsible do
       }
       {@rest}
     >
-      <%= render_slot(@inner_block) %>
+      {render_slot(@inner_block)}
     </div>
     """
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ defmodule SaladUI.Badge do @@
           }
           {@rest}
         >
-          <%= render_slot(@inner_block) %>
+          {render_slot(@inner_block)}
         </div>
         """
       end
@@ Expand Down @@