maquina-components 0.4.4 → 0.5.1

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

@@ -0,0 +1,14 @@
+<%# locals: (show_icon: true, css_classes: "btn btn-ghost", **html_options) %>
+<% merged_data = merge_component_data(html_options,
+    drawer_part: :close,
+    action: "click->drawer#close"
+  ) %>
+<%= content_tag :button, type: :button, class: css_classes, data: merged_data, **html_options do %>
+  <% if show_icon %> 
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+      <path d="M18 6 6 18"></path>
+      <path d="m6 6 12 12"></path>
+    </svg>
+  <% end %>
+  <%= yield %>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%# locals: (css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
+    drawer_part: :content
+  ) %>
+<%= content_tag :div, class: css_classes, data: merged_data, **html_options do %>
+  <%= yield %>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%# locals: (css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
+    drawer_part: :footer
+  ) %>
+<%= content_tag :div, class: css_classes, data: merged_data, **html_options do %>
+  <%= yield %>
+<% end %>

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

@@ -0,0 +1,12 @@
+<%# locals: (show_close: true, css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
+    drawer_part: :header
+  ) %>
+<%= content_tag :div, class: css_classes, data: merged_data, **html_options do %>
+  <div data-drawer-part="header-content">
+    <%= yield %>
+  </div>
+  <% if show_close %>
+    <%= render "components/drawer/close", css_classes: "btn btn-ghost btn-icon-sm" %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,14 @@
+<%# locals: (id: nil, default_open: false, css_classes: "", cookie_name: "drawer_state", keyboard_shortcut: "d", **html_options) %>
+<% merged_data = merge_component_data(html_options,
+    component: :drawer,
+    controller: "drawer",
+    outlet: "drawer",
+    drawer_default_open_value: default_open,
+    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 keydown.esc@window->drawer#closeOnEscape"
+  ) %>
+<%= content_tag :div, id: id || "drawer-provider", class: css_classes, data: merged_data, **html_options do %>
+  <%= yield %>
+<% end %>

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

@@ -0,0 +1,14 @@
+<%# locals: (variant: :default, size: :default, icon_name: nil, css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
+    drawer_part: :trigger,
+    controller: "drawer-trigger",
+    action: "click->drawer-trigger#triggerClick",
+    drawer_trigger_drawer_outlet: "[data-outlet='drawer']"
+  ) %>
+<% button_data = merged_data.merge(
+    component: "button"
+  ) %>
+<%= content_tag :button, type: :button, class: css_classes, data: button_data, **html_options do %>
+  <%= icon_for(icon_name) if icon_name %>
+  <%= yield %>
+<% end %>

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"
   ) %>

data/app/views/components/empty/_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,
     "empty-part": "content"
   ) %>
 

data/app/views/components/empty/_description.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,
     "empty-part": "description"
   ) %>
 
 <%= content_tag :p, 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/empty/_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,
     "empty-part": "header"
   ) %>
 

data/app/views/components/empty/_media.html.erb

@@ -1,5 +1,5 @@
-<%# locals: (icon: nil, variant: :icon, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<%# locals: (icon: nil, content: nil, variant: :icon, css_classes: "", **html_options) %>
+<% merged_data = merge_component_data(html_options,
     "empty-part": "media",
     variant: variant
   ) %>
@@ -7,7 +7,9 @@
 <%= content_tag :div, class: css_classes.presence, data: merged_data, **html_options do %>
   <% if icon.present? && respond_to?(:icon_for) %>
     <%= icon_for(icon) %>
-  <% elsif block_given? %>
+  <% elsif content %>
+    <%= content %>
+  <% else %>
     <%= yield %>
   <% end %>
 <% end %>

data/app/views/components/empty/_title.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,
     "empty-part": "title"
   ) %>
 
 <%= content_tag :h3, 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/pagination/_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,
     "pagination-part": "content"
   ) %>
 

data/app/views/components/pagination/_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,
     "pagination-part": "item"
   ) %>
 

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

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

data/app/views/components/pagination/_next.html.erb

@@ -1,7 +1,7 @@
 <%# locals: (href: nil, label: nil, disabled: false, show_label: true, css_classes: "", **html_options) %>
 <% is_disabled = disabled || href.nil?
   display_label = label || t("maquina_components.pagination.next", default: "Next")
-  merged_data = (html_options.delete(:data) || {}).merge("pagination-part": "next") %>
+  merged_data = merge_component_data(html_options, "pagination-part": "next") %>
 
 <% if is_disabled %>
   <span

data/app/views/components/pagination/_previous.html.erb

@@ -1,7 +1,7 @@
 <%# locals: (href: nil, label: nil, disabled: false, show_label: true, css_classes: "", **html_options) %>
 <% is_disabled = disabled || href.nil?
   display_label = label || t("maquina_components.pagination.previous", default: "Previous")
-  merged_data = (html_options.delete(:data) || {}).merge("pagination-part": "previous") %>
+  merged_data = merge_component_data(html_options, "pagination-part": "previous") %>
 
 <% if is_disabled %>
   <span

data/app/views/components/sidebar/_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,
     sidebar_part: :content
   ) %>
 

data/app/views/components/sidebar/_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,
     sidebar_part: :footer
   ) %>
 

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

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

data/app/views/components/sidebar/_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,
     sidebar_part: :header
   ) %>
 

data/app/views/components/sidebar/_inset.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,
     sidebar_part: :inset
   ) %>
 

data/app/views/components/sidebar/_menu.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,
     sidebar_part: :menu
   ) %>
 

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

@@ -1,5 +1,5 @@
 <%# locals: (title:, url:, icon_name: nil, size: :default, active: false, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     sidebar_part: "menu-button",
     size: size,
     active: active

data/app/views/components/sidebar/_menu_item.html.erb

@@ -1,6 +1,6 @@
 <%# locals: (css_classes: "", **html_options) %>
 <% merged_data =
-  (html_options.delete(:data) || {}).merge(sidebar_part: "menu-item") %>
+  merge_component_data(html_options, sidebar_part: "menu-item") %>
 
 <%= content_tag :li, class: "group/menu-item #{css_classes}", data: merged_data, **html_options do %>
   <%= yield %>

data/app/views/components/sidebar/_menu_link.html.erb

@@ -1,5 +1,5 @@
 <%# locals: (url: "#", active: false, title: nil, subtitle: nil, icon: nil, text_icon: nil, icon_classes: "", css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     sidebar_part: "menu-link",
     active: active
   ) %>
@@ -16,16 +16,13 @@
   <% end %>
 
   <% if title.present? || subtitle.present? %>
-    <div
-      class="flex flex-col gap-0.5 leading-none"
-      data-sidebar-hide-on-collapse
-    >
+    <div data-sidebar-part="menu-link-text" data-sidebar-hide-on-collapse>
       <% if title.present? %>
-        <span class="font-medium"><%= title %></span>
+        <span data-sidebar-part="menu-link-title"><%= title %></span>
       <% end %>
 
       <% if subtitle.present? %>
-        <span class="text-xs text-sidebar-foreground/70"><%= subtitle %></span>
+        <span data-sidebar-part="menu-link-subtitle"><%= subtitle %></span>
       <% end %>
     </div>
   <% end %>

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

@@ -1,5 +1,5 @@
 <%# locals: (id: nil, default_open: true, variant: :inset, css_classes: "", cookie_name: "sidebar_state", keyboard_shortcut: "b", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     component: :sidebar,
     variant: variant,
     controller: "sidebar",

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

@@ -1,5 +1,5 @@
 <%# locals: (icon_name: :left_panel, css_classes: "", **html_options) %>
-<% merged_data = (html_options.delete(:data) || {}).merge(
+<% merged_data = merge_component_data(html_options,
     sidebar_part: :trigger,
     controller: "sidebar-trigger",
     action: "click->sidebar-trigger#triggerClick",