maquina-components 0.5.0 → 0.5.1

data/app/views/components/_drawer.html.erb

@@ -1,6 +1,6 @@
-<%# locals: (id: nil, state: :closed, side: :right, css_classes: "", **html_options) %>
+<%# locals: (id: nil, state: :closed, side: :right, aria_label: "Drawer", css_classes: "", **html_options) %>
 <% stable_id = id || "drawer-#{side}"
-   merged_data = (html_options.delete(:data) || {}).merge(
+   merged_data = merge_component_data(html_options,
      drawer_part: :root,
      drawer_target: "drawer",
      state: state,
@@ -22,6 +22,12 @@
   <div
     id="<%= stable_id %>-panel"
     data-drawer-part="panel"
+    data-drawer-target="panel"
+    role="dialog"
+    aria-modal="true"
+    aria-label="<%= aria_label %>"
+    tabindex="-1"
+    <%= tag.attributes(aria: {hidden: true}, inert: true) if state.to_s == "closed" %>
   >
     <%# Inner drawer content wrapper %>
     <div id="<%= stable_id %>-inner" data-drawer-part="inner">

data/app/views/components/_dropdown.html.erb

@@ -1,25 +1,22 @@
-<div
-  data-menu-button-target="content"
-  class="
-    absolute z-10 overflow-hidden border border-border p-1 text-popover-foreground
-    min-w-56 max-w-56 content-fit shadow-md bottom-full rounded-lg hidden
-    peer-data-[state=closed]/menu-button:animate-out
-    peer-data-[state=closed]/menu-button:fade-out-0
-    peer-data-[state=open]/menu-button:fade-in-0
-    peer-data-[state=closed]/menu-button:zoom-out-95
-    peer-data-[state=open]/menu-button:zoom-in-95
-    peer-data-[side=bottom]/menu-button:slide-in-from-top-2
-    peer-data-[side=left]/menu-button:slide-in-from-right-2
-    peer-data-[side=right]/menu-button:slide-in-from-left-2
-    peer-data-[side=top]/menu-button:slide-in-from-bottom-2
-  "
-  role="menu"
-  aria-orientation="vertical"
-  aria-labelledby="menu-button"
-  tabindex="-1"
->
+<%# locals: (id: nil, side: :top, align: :start, css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
+    "menu-button-part": "content",
+    "menu-button-target": "content",
+    side: side,
+    align: align,
+    state: "closed"
+  ) %>
+<% aria_attrs = { orientation: "vertical" } %>
+<% aria_attrs[:labelledby] = "#{id}-trigger" if id.present? %>
+
+<%= content_tag :div,
+      id: (id.present? ? "#{id}-content" : nil),
+      role: "menu",
+      tabindex: "-1",
+      aria: aria_attrs,
+      class: css_classes.presence,
+      data: merged_data,
+      hidden: true,
+      **html_options do %>
   <%= yield %>
-</div>
-<!--
-<div role="separator" aria-orientation="horizontal" class="separator"></div>
--->
+<% end %>

data/app/views/components/_dropdown_menu.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (auto_close: false, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: "dropdown-menu",
     controller: "dropdown-menu"
   ) %>

data/app/views/components/_empty.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (variant: :default, size: :default, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: :empty,
     variant: variant,
     size: size

data/app/views/components/_header.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: :header
   ) %>
 

data/app/views/components/_menu_button.html.erb

@@ -1,44 +1,39 @@
-<%# locals: (title: "", subtitle: nil, icon: nil, text_icon: nil, icon_classes: "", submenu: false) %>
+<%# locals: (title: "", subtitle: nil, icon: nil, text_icon: nil, icon_classes: "", submenu: false, id: nil, css_classes: "", **html_options) %>
+<% menu_button_id = id || "menu-button-#{title.to_s.parameterize.presence || "menu"}" %>
+<% merged_data = merge_component_data(html_options,
+    component: "menu-button"
+  ) %>
 
-<ul class="flex w-full min-w-0 flex-col gap-1">
-  <li class="group/menu-item relative" data-controller="menu-button">
+<%= content_tag :ul, class: css_classes.presence, data: merged_data, **html_options do %>
+  <li data-menu-button-part="item" data-controller="menu-button">
     <button
+      type="button"
+      id="<%= menu_button_id %>-trigger"
       data-state="closed"
-      class="
-        peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2
-        text-left outline-none ring-sidebar-ring transition-[width,height,padding]
-        focus-visible:ring-2 active:bg-sidebar-accent
-        active:text-sidebar-accent-foreground disabled:pointer-events-none
-        disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50
-        data-[state=open]:bg-sidebar-accent
-        data-[state=open]text-sidebar-accent-foreground
-        group-data-[collapsible=icon]:size-8! [&>span:last-child]:truncate
-        [&>svg]:size-4 [&>svg]:shrink-0 hover:bg-sidebar-accent
-        hover:text-sidebar-accent-foreground h-12 text-sm
-        group-data-[collapsible=icon]:p-0!
-      ", data-action="menu-button#toggle", data-menu-button-target="button" }
+      data-menu-button-part="trigger"
+      data-menu-button-target="button"
+      data-action="menu-button#toggle"
+      aria-haspopup="menu"
+      aria-expanded="false"
     >
-        <% if icon.present? %>
-          <%= image_tag icon, alt: "maquina", class: "#{icon_classes}" %>
-        <% elsif text_icon.present? %>
-          <div
-            class="
-              flex aspect-square size-8 items-center justify-center rounded-lg
-              bg-sidebar-primary text-sidebar-primary-foreground
-            "
-          >
-              <span class="<%= icon_classes %>"><%= text_icon %></span>
-          </div>
-        <% end %>
-      <div class="grid flex-1 text-left text-sm leading-tight">
-        <span class="truncate font-semibold"><%= title %></span>
+      <% if icon.present? %>
+        <%= image_tag icon, alt: title.presence || "", class: icon_classes.presence %>
+      <% elsif text_icon.present? %>
+        <span data-menu-button-part="avatar">
+          <span class="<%= icon_classes %>"><%= text_icon %></span>
+        </span>
+      <% end %>
+
+      <span data-menu-button-part="text">
+        <span data-menu-button-part="title"><%= title %></span>
         <% if subtitle.present? %>
-          <span class="truncate text-xs"><%= subtitle %></span>
+          <span data-menu-button-part="subtitle"><%= subtitle %></span>
         <% end %>
-      </div>
+      </span>
+
       <%= builtin_icon_for(:chevron_up_down, class: "ml-auto") if submenu %>
     </button>
 
-    <%= yield %>
+    <%= yield menu_button_id %>
   </li>
-</ul>
+<% end %>

data/app/views/components/_pagination.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: :pagination
   ) %>
 

data/app/views/components/_separator.html.erb

@@ -1,11 +1,10 @@
-<%# locals: (orientation: :horizontal) -%>
+<%# locals: (orientation: :horizontal, css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
+    component: :separator,
+    orientation: orientation
+  ) %>
 
-<div
-  data-orientation="<%= orientation %>"
-  role="none"
-  class="
-    bg-border shrink-0 data-[orientation=horizontal]:h-px
-    data-[orientation=horizontal]:w-full data-[orientation=vertical]:w-px mx-2
-    data-[orientation=vertical]:h-4
-  "
-></div>
+<%= tag.div role: "none",
+      class: css_classes.presence,
+      data: merged_data,
+      **html_options %>

data/app/views/components/_sidebar.html.erb

@@ -1,7 +1,7 @@
 <%# locals: (id: nil, state: :collapsed, collapsible: :offcanvas, variant: :inset, side: :left, css_classes: "", **html_options) %>
 <% stable_id = id || "sidebar-#{side}"
   
-  merged_data = (html_options.delete(:data) || {}).merge(
+  merged_data = merge_component_data(html_options,
     sidebar_part: :root,
     sidebar_target: "sidebar",
     state: state,

data/app/views/components/_simple_table.html.erb

@@ -1,4 +1,6 @@
-<%# locals: (collection:, columns:, caption: nil, variant: nil, table_variant: nil, empty_message: "No data available", row_id: nil, html_options: {}) %>
+<%# locals: (collection:, columns:, caption: nil, variant: nil, table_variant: nil, empty_message: "No data available", row_id: nil, html_options: {}, **extra_html_options) %>
+<%# html_options: {} is the legacy call style; bare keyword passthrough is the standard one %>
+<% html_options = html_options.merge(extra_html_options) %>
 <%= render "components/table", variant: variant, table_variant: table_variant, **html_options do %>
   <% if caption.present? %>
     <%= render "components/table/caption" do %><%= caption %><% end %>

data/app/views/components/_table.html.erb

@@ -1,7 +1,7 @@
 <%# locals: (css_classes: "", container: true, variant: nil, table_variant: nil, **html_options) %>
 <%
   # Table data attributes - merge user data with component defaults
-  table_data = (html_options.delete(:data) || {}).merge(component: :table)
+  table_data = merge_component_data(html_options, component: :table)
   table_data[:variant] = table_variant if table_variant
 
   # Container data attributes

data/app/views/components/_toast.html.erb

@@ -1,5 +1,10 @@
 <%# locals: (variant: :default, title: nil, description: nil, icon: nil, duration: 5000, dismissible: true, content: nil, css_classes: "", **html_options) %>
 <%
+  # :destructive is the library-wide danger variant; toast renders it
+  # with its existing error styling
+  variant = variant.to_s.to_sym
+  variant = :error if variant == :destructive
+
   # Auto-select icon based on variant if not provided
   default_icons = {
     default: nil,
@@ -10,7 +15,7 @@
   }
   toast_icon = icon || default_icons[variant]
 %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: :toast,
     controller: "toast",
     variant: variant,

data/app/views/components/_toaster.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (position: :bottom_right, content: nil, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: :toaster,
     controller: "toaster",
     position: position.to_s.dasherize,

data/app/views/components/_toggle_group.html.erb

@@ -5,7 +5,7 @@
                     else [value.to_s]
                     end
   
-  merged_data = (html_options.delete(:data) || {}).merge(
+  merged_data = merge_component_data(html_options,
     controller: "toggle-group",
     component: "toggle-group",
     variant: variant,

data/app/views/components/alert/_description.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (text: nil, content: nil, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(alert_part: :description) %>
+<% merged_data = merge_component_data(html_options, alert_part: :description) %>
 
 <%= content_tag :div, class: css_classes.presence, data: merged_data, **html_options do %>
   <%= text || content %>

data/app/views/components/alert/_title.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (text: nil, content: nil, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(alert_part: :title) %>
+<% merged_data = merge_component_data(html_options, alert_part: :title) %>
 
 <%= content_tag :div, class: css_classes.presence, data: merged_data, **html_options do %>
   <%= text || content %>

data/app/views/components/breadcrumbs/_ellipsis.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     breadcrumb_part: :ellipsis
   ) %>
 

data/app/views/components/breadcrumbs/_item.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     breadcrumb_part: :item
   ) %>
 

data/app/views/components/breadcrumbs/_link.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (href:, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     breadcrumb_part: :link
   ) %>
 

data/app/views/components/breadcrumbs/_list.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     breadcrumb_part: :list
   ) %>
 

data/app/views/components/breadcrumbs/_page.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     breadcrumb_part: :page
   ) %>
 

data/app/views/components/breadcrumbs/_separator.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (icon: :chevron_right, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     breadcrumb_part: :separator
   ) %>
 

data/app/views/components/calendar/_header.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (month:, year:, month_name:, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge("calendar-part": "header") %>
+<% merged_data = merge_component_data(html_options, "calendar-part": "header") %>
 
 <%= content_tag :div, class: css_classes.presence, data: merged_data, **html_options do %>
   <button type="button"

data/app/views/components/calendar/_week.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (days:, display_month:, selected_date: nil, selected_end_date: nil, mode: :single, min_date: nil, max_date: nil, disabled_dates: [], show_outside_days: true, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge("calendar-part": "week") %>
+<% merged_data = merge_component_data(html_options, "calendar-part": "week") %>
 
 <%= content_tag :div, role: "row", class: css_classes.presence, data: merged_data, **html_options do %>
   <% days.each do |day| %>

data/app/views/components/card/_action.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(card_part: :action) %>
+<% merged_data = merge_component_data(html_options, card_part: :action) %>
 
 <%= content_tag :div, class: css_classes.presence, data: merged_data, **html_options do %>
   <%= yield %>

data/app/views/components/card/_content.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (spacing: :default, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     card_part: :content,
     spacing: (spacing == :full ? :full : nil)
   ).compact %>

data/app/views/components/card/_description.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (text: nil, content: nil, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(card_part: :description) %>
+<% merged_data = merge_component_data(html_options, card_part: :description) %>
 
 <%= content_tag :div, class: css_classes.presence, data: merged_data, **html_options do %>
   <%= text || content %>

data/app/views/components/card/_footer.html.erb

@@ -6,7 +6,7 @@
     else nil
   end
   
-  merged_data = (html_options.delete(:data) || {}).merge(
+  merged_data = merge_component_data(html_options,
     card_part: :footer,
     align: align_value,
     spacing: (spacing == :full ? :full : nil)

data/app/views/components/card/_header.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (layout: :column, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     card_part: :header,
     layout: (layout == :row ? :row : nil)
   ).compact %>

data/app/views/components/card/_title.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (text: nil, content: nil, size: :default, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     card_part: :title,
     size: (size == :sm ? :sm : nil)
   ).compact %>

data/app/views/components/combobox/_content.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (id:, align: :start, width: :default, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     combobox_part: "content",
     combobox_target: "content",
     align: align,

data/app/views/components/combobox/_empty.html.erb

@@ -1,9 +1,9 @@
-<%# locals: (text: "No results found.", css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<%# locals: (text: "No results found.", content: nil, css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
     combobox_part: "empty",
     combobox_target: "empty"
   ) %>
 
 <%= content_tag :div, class: css_classes.presence, data: merged_data, hidden: true, **html_options do %>
-  <%= text %>
+  <%= content.presence || text %>
 <% end %>

data/app/views/components/combobox/_group.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     combobox_part: "group"
   ) %>
 

data/app/views/components/combobox/_input.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (placeholder: "Search...", css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     combobox_part: "input",
     combobox_target: "input",
     action: "input->combobox#filter"

data/app/views/components/combobox/_label.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (text: nil, content: nil, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     combobox_part: "label"
   ) %>
 

data/app/views/components/combobox/_list.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     combobox_part: "list"
   ) %>
 

data/app/views/components/combobox/_option.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (value:, selected: false, disabled: false, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     combobox_part: "option",
     combobox_target: "option",
     value: value,

data/app/views/components/combobox/_separator.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     combobox_part: "separator"
   ) %>
 

data/app/views/components/combobox/_trigger.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (for_id:, placeholder: "Select...", variant: :outline, size: :default, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: :button,
     variant: variant,
     size: size,

data/app/views/components/drawer/_close.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (show_icon: true, css_classes: "btn btn-ghost", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     drawer_part: :close,
     action: "click->drawer#close"
   ) %>

data/app/views/components/drawer/_content.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     drawer_part: :content
   ) %>
 <%= content_tag :div, class: css_classes, data: merged_data, **html_options do %>

data/app/views/components/drawer/_footer.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     drawer_part: :footer
   ) %>
 <%= content_tag :div, class: css_classes, data: merged_data, **html_options do %>

data/app/views/components/drawer/_header.html.erb

@@ -1,9 +1,9 @@
 <%# locals: (show_close: true, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     drawer_part: :header
   ) %>
 <%= content_tag :div, class: css_classes, data: merged_data, **html_options do %>
-  <div class="flex-1">
+  <div data-drawer-part="header-content">
     <%= yield %>
   </div>
   <% if show_close %>

data/app/views/components/drawer/_provider.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (id: nil, default_open: false, css_classes: "", cookie_name: "drawer_state", keyboard_shortcut: "d", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: :drawer,
     controller: "drawer",
     outlet: "drawer",
@@ -7,7 +7,7 @@
     drawer_open_value: default_open,
     drawer_cookie_name_value: cookie_name,
     drawer_keyboard_shortcut_value: keyboard_shortcut,
-    action: "keydown.meta+#{keyboard_shortcut}@window->drawer#toggleWithKeyboard keydown.ctrl+#{keyboard_shortcut}@window->drawer#toggleWithKeyboard"
+    action: "keydown.meta+#{keyboard_shortcut}@window->drawer#toggleWithKeyboard keydown.ctrl+#{keyboard_shortcut}@window->drawer#toggleWithKeyboard keydown.esc@window->drawer#closeOnEscape"
   ) %>
 <%= content_tag :div, id: id || "drawer-provider", class: css_classes, data: merged_data, **html_options do %>
   <%= yield %>

data/app/views/components/drawer/_trigger.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (variant: :default, size: :default, icon_name: nil, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     drawer_part: :trigger,
     controller: "drawer-trigger",
     action: "click->drawer-trigger#triggerClick",

data/app/views/components/dropdown_menu/_content.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (align: :start, side: :bottom, width: :default, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     "dropdown-menu-part": "content",
     "dropdown-menu-target": "content",
     align: align,

data/app/views/components/dropdown_menu/_group.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     "dropdown-menu-part": "group"
   ) %>
 

data/app/views/components/dropdown_menu/_item.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (href: nil, method: nil, variant: :default, disabled: false, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     "dropdown-menu-part": "item",
     variant: variant
   ) %>

data/app/views/components/dropdown_menu/_label.html.erb

@@ -1,13 +1,9 @@
-<%# locals: (text: nil, inset: false, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<%# locals: (text: nil, content: nil, inset: false, css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
     "dropdown-menu-part": "label",
     inset: inset
   ) %>
 
 <%= content_tag :div, class: css_classes.presence, data: merged_data, **html_options do %>
-  <% if text.present? %>
-    <%= text %>
-  <% else %>
-    <%= yield %>
-  <% end %>
+  <%= text.presence || content || yield %>
 <% end %>

data/app/views/components/dropdown_menu/_separator.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     "dropdown-menu-part": "separator"
   ) %>
 

data/app/views/components/dropdown_menu/_shortcut.html.erb

@@ -1,12 +1,8 @@
-<%# locals: (text: nil, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<%# locals: (text: nil, content: nil, css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
     "dropdown-menu-part": "shortcut"
   ) %>
 
 <%= content_tag :span, class: css_classes.presence, data: merged_data, **html_options do %>
-  <% if text.present? %>
-    <%= text %>
-  <% else %>
-    <%= yield %>
-  <% end %>
+  <%= text.presence || content || yield %>
 <% end %>

data/app/views/components/dropdown_menu/_trigger.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (variant: :outline, size: :default, as_child: false, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     "dropdown-menu-target": "trigger",
     action: "dropdown-menu#toggle"
   ) %>