maquina-components 0.7.2 → 0.7.4

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

@@ -5,7 +5,7 @@
     active: (active ? true : nil)
   ) %>
 
-<%= link_to url, class: css_classes, data: merged_data,
+<%= link_to url, class: css_classes.presence, data: merged_data,
       "aria-current": (active ? "page" : nil), **html_options do %>
   <% if icon_name.present? %>
     <%= icon_for(icon_name) %>

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

@@ -2,6 +2,6 @@
 <% merged_data =
   merge_component_data(html_options, sidebar_part: "menu-item") %>
 
-<%= content_tag :li, class: "group/menu-item #{css_classes}", data: merged_data, **html_options do %>
+<%= content_tag :li, class: class_names("group/menu-item", css_classes), data: merged_data, **html_options do %>
   <%= yield %>
 <% end %>

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

@@ -4,14 +4,14 @@
     active: (active ? true : nil)
   ) %>
 
-<%= link_to url, class: css_classes, data: merged_data,
+<%= link_to url, class: css_classes.presence, data: merged_data,
       "aria-current": (active ? "page" : nil), **html_options do %>
   <% if icon.present? || text_icon.present? %>
     <div data-sidebar-part="menu-avatar">
       <% if icon.present? %>
-        <%= image_tag icon, class: icon_classes %>
+        <%= image_tag icon, class: icon_classes.presence %>
       <% elsif text_icon.present? %>
-        <span class="<%= icon_classes %>"><%= text_icon %></span>
+        <%= tag.span text_icon, class: icon_classes.presence %>
       <% end %>
     </div>
   <% end %>

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

@@ -11,6 +11,6 @@
     action: "keydown.meta+#{keyboard_shortcut}@window->sidebar#toggleWithKeyboard keydown.ctrl+#{keyboard_shortcut}@window->sidebar#toggleWithKeyboard"
   ) %>
 
-<%= content_tag :div, id: id || "sidebar-provider", class: css_classes, data: merged_data, **html_options do %>
+<%= content_tag :div, id: id || "sidebar-provider", class: css_classes.presence, data: merged_data, **html_options do %>
   <%= yield %>
 <% end %>

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

@@ -6,7 +6,7 @@
     sidebar_trigger_sidebar_outlet: "[data-outlet='sidebar']"
   ) %>
 
-<%= button_tag type: :button, class: css_classes, data: merged_data, **html_options do %>
+<%= button_tag type: :button, class: css_classes.presence, data: merged_data, **html_options do %>
   <%= icon_for(icon_name) %>
   <span class="sr-only">Toggle Sidebar</span>
 <% end %>

data/app/views/components/stats/_stats_card.html.erb

@@ -5,8 +5,9 @@
   icon_classes = icon_classes.presence || icon_class
   value_classes = value_classes.presence || value_class
 
-  # Legacy string icon names map to built-in icons; symbols pass straight
-  # through; anything else renders as custom icon markup.
+  # Symbols resolve through icon_for (app icons first, then built-ins);
+  # legacy kebab-case strings map to built-in names; anything else renders
+  # as custom icon markup.
   legacy_icons = {
     "message-square" => :message_square,
     "arrow-up" => :arrow_up,
@@ -25,16 +26,16 @@
   <div data-stats-part="body">
     <div data-stats-part="text">
       <p data-stats-part="title"><%= title %></p>
-      <p data-stats-part="value" class="<%= value_classes.presence %>"><%= value %></p>
+      <%= tag.p value, class: value_classes.presence, data: {stats_part: "value"} %>
       <% if subtitle.present? %>
         <p data-stats-part="subtitle"><%= subtitle %></p>
       <% end %>
     </div>
 
     <% if icon.present? %>
-      <div data-stats-part="icon" class="<%= icon_classes.presence %>">
-        <%= icon_name ? builtin_icon_for(icon_name, class: "size-8") : icon %>
-      </div>
+      <%= tag.div class: icon_classes.presence, data: {stats_part: "icon"} do %>
+        <%= icon_name ? icon_for(icon_name, class: "size-8") : icon %>
+      <% end %>
     <% end %>
   </div>
 <% end %>

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

@@ -1,6 +1,7 @@
 <%# locals: (label:, href: nil, method: nil, css_classes: "", **html_options) %>
 <% merged_data = merge_component_data(html_options,
-    toast_part: "action"
+    toast_part: "action",
+    action: ("toast#handleAction" if href.blank?)
   ) %>
 
 <% merged_data["turbo-method"] = method if method.present? %>

data/lib/generators/maquina_components/install/templates/theme.css.tt

@@ -155,6 +155,17 @@
   --color-destructive: var(--destructive);
   --color-destructive-foreground: var(--destructive-foreground);
 
+  --color-success: var(--success);
+  --color-success-foreground: var(--success-foreground);
+
+  --color-warning: var(--warning);
+  --color-warning-foreground: var(--warning-foreground);
+
+  /* --info and --info-foreground are declared in the shape/state token block
+     the installer appends below this palette. */
+  --color-info: var(--info);
+  --color-info-foreground: var(--info-foreground);
+
   --color-input: var(--input);
   --color-border: var(--border);
   --color-ring: var(--ring);

data/lib/maquina_components/doctor.rb

@@ -54,6 +54,13 @@ module MaquinaComponents
     # Assigning a data URI to one of the five mark properties IS the 0.6.0
     # pattern, so it must not be reported as a restated rule.
     MARK_TOKEN_ASSIGNMENT = /--(?:checkbox-mark|checkbox-indeterminate|radio-mark|switch-thumb|select-chevron)-image\s*:/
+    RESTATED_SVG_SUGGESTION =
+      "0.6.0 exposes these marks as overridable custom properties:\n" \
+      "--checkbox-mark-image, --checkbox-indeterminate-image, --radio-mark-image,\n" \
+      "--switch-thumb-image, --select-chevron-image. Assign your SVG to the token\n" \
+      "instead of restating the engine's rule."
+    # A component hook in markup: data-component="..." or a helper's component: key.
+    MARKUP_COMPONENT_HOOK = /data-component=|\bcomponent:\s*[:"']/
     RADIUS_DECL = /(?:border-radius\s*:|@apply[^;{}]*\brounded(?:-[a-z0-9\[\].\/-]+)?\b)/
     SHADOW_DECL = /(?:box-shadow\s*:|@apply[^;{}]*\b(?:shadow|ring)(?:-[a-z0-9\[\].\/-]+)?\b)/
     FOCUS_SELECTOR = /:focus(-visible|-within)?\b/
@@ -238,6 +245,13 @@ module MaquinaComponents
 
       return unless component_selector?(chain)
 
+      # Only here, under a component selector, does an SVG restate an engine
+      # mark. Anywhere else it is the app's own artwork -- Rails' actiontext.css
+      # carries fifteen for the Trix editor.
+      if SVG_DATA_URI.match?(declaration) && !MARK_TOKEN_ASSIGNMENT.match?(declaration)
+        add(path, index, declaration, :breaking, "restated-svg-uri", RESTATED_SVG_SUGGESTION)
+      end
+
       if RADIUS_DECL.match?(declaration)
         add(path, index, declaration, :review, "hardcoded-radius",
           "0.6.0 reads --control-radius / --surface-radius / --mark-radius / --pill-radius.\n" \
@@ -319,20 +333,16 @@ module MaquinaComponents
           "Use the value form of the variant: data-[active=true]:... - the bare\n" \
           "data-[active] variant relies on an attribute 0.6.0 no longer emits when false.")
       end
-
-      if SVG_DATA_URI.match?(line) && !MARK_TOKEN_ASSIGNMENT.match?(line)
-        add(path, index, line, :breaking, "restated-svg-uri",
-          "0.6.0 exposes these marks as overridable custom properties:\n" \
-          "--checkbox-mark-image, --checkbox-indeterminate-image, --radio-mark-image,\n" \
-          "--switch-thumb-image, --select-chevron-image. Assign your SVG to the token\n" \
-          "instead of restating the engine's rule.")
-      end
     end
 
     def scan_markup(path)
       read(path).each_with_index do |line, index|
         scan_shared(path, index, line)
 
+        if SVG_DATA_URI.match?(line) && MARKUP_COMPONENT_HOOK.match?(line)
+          add(path, index, line, :breaking, "restated-svg-uri", RESTATED_SVG_SUGGESTION)
+        end
+
         # Cross-file signals for check_invalid_without_aria.
         @aria_invalid_seen ||= ARIA_INVALID.match?(line)
         if ERROR_PART.match?(line) || FIELD_WITH_ERRORS.match?(line)

data/lib/maquina_components/version.rb

@@ -1,3 +1,3 @@
 module MaquinaComponents
-  VERSION = "0.7.2"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maquina-components
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Mario Alberto Chávez