Merge pull request #3662 from projectblacklight/extract-remove-button

Extract remove_button method for easier customization of the applied …

Author: seanaery

app/components/blacklight/constraint_layout_component.html.erb

@@ -7,10 +7,5 @@
       <%= content_tag :span, @value, class: 'filter-value', title: strip_tags(@value) %>
     <% end %>
   </span>
-  <% if @remove_path.present? %>
-    <%= link_to(@remove_path, class: 'btn btn-outline-secondary remove') do %>
-      <%= render Blacklight::Icons::RemoveComponent.new(aria_hidden: true) %>
-      <span class="visually-hidden"><%= remove_aria_label %></span>
-    <% end %>
-  <% end %>
+  <%= remove_button %>
 </span>

app/components/blacklight/constraint_layout_component.rb

@@ -21,5 +21,14 @@ def remove_aria_label
     def render?
       @value.present?
     end
+
+    def remove_button
+      return unless @remove_path
+
+      link_to(@remove_path, class: 'btn btn-outline-secondary remove') do
+        render(Blacklight::Icons::RemoveComponent.new(aria_hidden: true)) +
+          tag.span(remove_aria_label, class: "visually-hidden")
+      end
+    end
   end
 end