Introduce a trim: Boolean argument for the BaseComponent that trims…

… the content with `strip` before rendering it

app/components/primer/base_component.rb

@@ -151,13 +151,16 @@ class BaseComponent < Primer::Component
     # | :- | :- | :- |
     # | classes | String | CSS class name value to be concatenated with generated Primer CSS classes. |
     # | test_selector | String | Adds `data-test-selector='given value'` in non-Production environments for testing purposes. |
+    # | trim | Boolean | Calls `strip` on the content to remove trailing and leading white spaces. |
     def initialize(tag:, classes: nil, **system_arguments)
       @tag = tag
 
       @system_arguments = validate_arguments(tag: tag, **system_arguments)
 
       @result = Primer::Classify.call(**@system_arguments.merge(classes: classes))
 
+      @trim = !!@system_arguments[:trim]
+
       @system_arguments[:"data-view-component"] = true
       # Filter out Primer keys so they don't get assigned as HTML attributes
       @content_tag_args = add_test_selector(@system_arguments).except(*Primer::Classify::Utilities::UTILITIES.keys)
@@ -167,7 +170,10 @@ def call
       if SELF_CLOSING_TAGS.include?(@tag)
         tag(@tag, @content_tag_args.merge(@result))
       else
-        content_tag(@tag, content, @content_tag_args.merge(@result))
+        # strip unsets `html_safe`, so we have to set it back again to guarantee that HTML blocks won't break
+        parsed_content = (@trim && !content.blank?) ? content.strip.html_safe : content # rubocop:disable Rails/OutputSafety
+
+        content_tag(@tag, parsed_content, @content_tag_args.merge(@result))
       end
     end
   end

app/components/primer/beta/link.html.erb

@@ -1,16 +1,16 @@
-<%= render Primer::ConditionalWrapper.new(condition: tooltip?, tag: :span, position: :relative) do %>
-  <%= render(Primer::BaseComponent.new(**@system_arguments)) do -%>
+<%= render Primer::ConditionalWrapper.new(condition: tooltip?, trim: true, tag: :span, position: :relative) do %>
+  <%= render(Primer::BaseComponent.new(trim: true, **@system_arguments)) do %>
     <% if leading_visual %>
       <span class="Link-visual Link-leadingVisual">
         <%= leading_visual %>
       </span>
     <% end %>
-    <%= trimmed_content -%>
+    <%= content %>
     <% if trailing_visual %>
       <span class="Link-visual Link-trailingVisual">
         <%= trailing_visual %>
       </span>
     <% end %>
-  <% end -%>
-  <%= tooltip %>
+  <% end %>
+  <%= tooltip if tooltip? %>
 <% end %>

app/components/primer/beta/link.rb

@@ -80,19 +80,6 @@ def initialize(href: nil, scheme: DEFAULT_SCHEME, muted: false, underline: false
       def before_render
         raise ArgumentError, "href is required" if @system_arguments[:href].nil? && !Rails.env.production?
       end
-
-      private
-
-      def trimmed_content
-        return if content.blank?
-
-        trimmed_content = content.strip
-
-        return trimmed_content unless content.html_safe?
-
-        # strip unsets `html_safe`, so we have to set it back again to guarantee that HTML blocks won't break
-        trimmed_content.html_safe # rubocop:disable Rails/OutputSafety
-      end
     end
   end
 end