primer_view_components 0.0.86 → 0.0.89

data/app/components/primer/link_component.rb

@@ -79,5 +79,19 @@ module Primer
     def before_render
       raise ArgumentError, "href is required when using <a> tag" if @system_arguments[:tag] == :a && @system_arguments[:href].nil? && !Rails.env.production?
     end
+
+    def call
+      if tooltip.present?
+        render Primer::BaseComponent.new(tag: :span, position: :relative) do
+          render(Primer::BaseComponent.new(**@system_arguments)) do
+            content
+          end.to_s + tooltip.to_s
+        end
+      else
+        render(Primer::BaseComponent.new(**@system_arguments)) do
+          content
+        end
+      end
+    end
   end
 end

data/app/components/primer/popover_component.rb

@@ -119,7 +119,7 @@ module Primer
     end
 
     def body_component
-      Primer::BoxComponent.new(**@body_arguments)
+      Primer::Box.new(**@body_arguments)
     end
   end
 end

data/app/helpers/primer/form_helper.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Primer
+  # :nodoc:
+  module FormHelper
+    def primer_form_with(**kwargs, &block)
+      form_with(**kwargs, skip_default_ids: false, builder: Primer::Forms::Builder, &block)
+    end
+  end
+end

data/lib/primer/form_components.rb

@@ -17,7 +17,7 @@ module Primer
         end
 
         def call
-          builder = ActionView::Helpers::FormBuilder.new(
+          builder = Primer::Forms::Builder.new(
             nil, nil, __vc_original_view_context, {}
           )
 
@@ -28,7 +28,7 @@ module Primer
             &@block
           )
 
-          input.render_in(__vc_original_view_context) { content }
+          input.to_component.render_in(__vc_original_view_context) { content }
         end
       end
     end

data/lib/primer/forms/base.html.erb

@@ -1,6 +1,6 @@
 <%= render(SpacingWrapper.new) do %>
   <% inputs.each do |input| %>
-    <%= render(input) %>
+    <%= render(input.to_component) %>
   <% end %>
 <% end %>
 <% if after_content? %>

data/lib/primer/forms/base.rb

@@ -17,6 +17,11 @@ module Primer
         end
 
         def new(builder, **options)
+          if builder && !builder.is_a?(Primer::Forms::Builder)
+            raise ArgumentError, "please pass an instance of Primer::Forms::Builder when "\
+              "constructing a form object (consider using the `primer_form_with` helper)"
+          end
+
           allocate.tap do |form|
             form.instance_variable_set(:@builder, builder)
             form.send(:initialize, **options)

data/lib/primer/forms/base_component.rb

@@ -39,6 +39,10 @@ module Primer
         false
       end
 
+      def to_component
+        self
+      end
+
       private
 
       def compile_and_render_template

data/lib/primer/forms/buffer_rewriter.rb

@@ -16,8 +16,9 @@ module Primer
           code.dup.tap do |result|
             parser.var_refs.reverse_each do |lineno, stop|
               line_offset = line_offsets[lineno]
-              start = (stop - "@output_buffer".length) + line_offset
               stop += line_offset
+              stop -= 1 if stop < code.length
+              start = stop - "@output_buffer".length
               result[start...stop] = "output_buffer"
             end
           end
@@ -39,7 +40,7 @@ module Primer
       def on_var_ref(var)
         return unless var == "@output_buffer"
 
-        var_refs << [lineno, column - 1]
+        var_refs << [lineno, column]
       end
 
       def var_refs

data/lib/primer/forms/builder.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "primer/classify"
+
+module Primer
+  module Forms
+    # :nodoc:
+    class Builder < ActionView::Helpers::FormBuilder
+      include Primer::ClassNameHelper
+
+      UTILITY_KEYS = Primer::Classify::Utilities::UTILITIES.keys.freeze
+
+      def label(*args, **options, &block)
+        super(*args, classify(options), &block)
+      end
+
+      def check_box(*args, **options, &block)
+        super(*args, classify(options), &block)
+      end
+
+      def radio_button(*args, **options, &block)
+        super(*args, classify(options), &block)
+      end
+
+      def select(*args, **options, &block)
+        super(*args, classify(options), &block)
+      end
+
+      def text_field(*args, **options, &block)
+        super(*args, classify(options), &block)
+      end
+
+      def text_area(*args, **options, &block)
+        super(*args, classify(options), &block)
+      end
+
+      private
+
+      def classify(options)
+        options[:classes] = class_names(options.delete(:class), options[:classes])
+        options.merge!(Primer::Classify.call(options))
+        options.except!(*UTILITY_KEYS)
+        options[:class] = class_names(options[:class], options.delete(:classes))
+        options
+      end
+    end
+  end
+end

data/lib/primer/forms/check_box_group.html.erb

@@ -6,7 +6,7 @@
   <% end %>
   <%= render(SpacingWrapper.new) do %>
     <% @input.check_boxes.each do |check_box| %>
-      <%= render(check_box) %>
+      <%= render(check_box.to_component) %>
     <% end %>
   <% end %>
 </fieldset>

data/lib/primer/forms/dsl/input.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "primer/classify"
-
 module Primer
   module Forms
     module Dsl
@@ -16,8 +14,6 @@ module Primer
         }.freeze
         SIZE_OPTIONS = SIZE_MAPPINGS.keys
 
-        UTILITY_KEYS = Primer::Classify::Utilities::UTILITIES.keys.freeze
-
         include Primer::ClassNameHelper
 
         attr_reader :builder, :form, :input_arguments, :label_arguments, :caption, :validation_message, :ids
@@ -27,14 +23,11 @@ module Primer
           @form = form
 
           @input_arguments = system_arguments
-          process_classes!(@input_arguments)
-
           @label_arguments = @input_arguments.delete(:label_arguments) || {}
-          process_classes!(@label_arguments)
 
           @label_arguments[:class] = class_names(
             @label_arguments[:class],
-            @input_arguments.fetch(:visually_hide_label, true) ? "sr-only" : nil
+            @input_arguments.fetch(:visually_hide_label, false) ? "sr-only" : nil
           )
 
           @input_arguments.delete(:visually_hide_label)
@@ -207,23 +200,8 @@ module Primer
           true
         end
 
-        # Avoid using Rails delegation here for performance reasons
-        # rubocop:disable Rails/Delegate
-        def render_in(view_context)
-          to_component.render_in(view_context)
-        end
-        # rubocop:enable Rails/Delegate
-
         private
 
-        def process_classes!(args)
-          args[:classes] = class_names(args.delete(:class), args[:classes])
-          args.merge!(Primer::Classify.call(args))
-          args[:class] = class_names(args[:class], args.delete(:classes))
-          args.except!(*UTILITY_KEYS)
-          args
-        end
-
         def input_data
           @input_arguments[:data] ||= {}
         end

data/lib/primer/forms/dsl/input_group.rb

@@ -28,13 +28,6 @@ module Primer
         def input?
           true
         end
-
-        # Avoid using Rails delegation here for performance reasons
-        # rubocop:disable Rails/Delegate
-        def render_in(view_context)
-          to_component.render_in(view_context)
-        end
-        # rubocop:enable Rails/Delegate
       end
     end
   end

data/lib/primer/forms/group.html.erb

@@ -1,5 +1,5 @@
 <%= content_tag_if(horizontal?, :div, class: "d-flex", style: "gap: 15px;") do %>
   <% @inputs.each do |input| %>
-    <%= render(input) %>
+    <%= render(input.to_component) %>
   <% end %>
 <% end %>

data/lib/primer/forms/multi.html.erb

@@ -1,3 +1,3 @@
 <% @input.inputs.each do |child_input| %>
-  <%= render(child_input) %>
+  <%= render(child_input.to_component) %>
 <% end %>

data/lib/primer/view_components/engine.rb

@@ -15,6 +15,7 @@ module Primer
 
       config.eager_load_paths = %W[
         #{root}/app/components
+        #{root}/app/helpers
         #{root}/app/lib
       ]
 
@@ -39,6 +40,16 @@ module Primer
         end
       end
 
+      initializer "primer.forms.helpers" do
+        ActiveSupport.on_load :action_controller do
+          require "primer/form_helper"
+          helper Primer::FormHelper
+
+          # make primer_form_with available to view components also
+          ViewComponent::Base.prepend(Primer::FormHelper)
+        end
+      end
+
       initializer "primer_view_components.zeitwerk_ignore" do
         Rails.autoloaders.each do |autoloader|
           autoloader.ignore(Engine.root.join("lib", "primer", "view_components", "linters.rb"))

data/lib/primer/view_components/linters/argument_mappers/label.rb

@@ -13,9 +13,9 @@ module ERBLint
           symbolize: true
         ).freeze
 
-        VARIANT_MAPPINGS = Primer::ViewComponents::Constants.get(
+        SIZE_MAPPINGS = Primer::ViewComponents::Constants.get(
           component: "Primer::LabelComponent",
-          constant: "VARIANT_MAPPINGS",
+          constant: "SIZE_MAPPINGS",
           symbolize: true
         ).freeze
 
@@ -24,6 +24,11 @@ module ERBLint
           constant: "DEFAULT_TAG"
         ).freeze
 
+        INLINE_CLASS = Primer::ViewComponents::Constants.get(
+          component: "Primer::LabelComponent",
+          constant: "INLINE_CLASS"
+        ).freeze
+
         ATTRIBUTES = %w[title].freeze
 
         def attribute_to_args(attribute)
@@ -36,8 +41,10 @@ module ERBLint
 
             if SCHEME_MAPPINGS[class_name] && acc[:scheme].nil?
               acc[:scheme] = SCHEME_MAPPINGS[class_name]
-            elsif VARIANT_MAPPINGS[class_name] && acc[:variant].nil?
-              acc[:variant] = VARIANT_MAPPINGS[class_name]
+            elsif SIZE_MAPPINGS[class_name] && acc[:size].nil?
+              acc[:size] = SIZE_MAPPINGS[class_name]
+            elsif class_name == INLINE_CLASS && acc[:inline].nil?
+              acc[:inline] = true
             else
               acc[:classes] << class_name
             end

data/lib/primer/view_components/linters/flash_migration_counter.rb

@@ -12,7 +12,7 @@ module ERBLint
 
       TAGS = %w[div].freeze
       CLASSES = %w[flash].freeze
-      MESSAGE = "We are migrating flashes to use [Primer::Beta::Flash](https://primer.style/view-components/components/flash), please try to use that instead of raw HTML."
+      MESSAGE = "We are migrating flashes to use [Primer::Beta::Flash](https://primer.style/view-components/components/beta/flash), please try to use that instead of raw HTML."
       ARGUMENT_MAPPER = ArgumentMappers::Flash
       COMPONENT = "Primer::Beta::Flash"
 

data/lib/primer/view_components/linters/helpers/deprecated_components_helpers.rb

@@ -7,10 +7,12 @@ module ERBLint
       module DeprecatedComponentsHelpers
         # If there is no alternative to suggest, set the value to nil
         COMPONENT_TO_USE_INSTEAD = {
+          "Primer::ButtonGroup" => "Primer::Beta::ButtonGroup",
           "Primer::Alpha::AutoComplete::Item" => "Primer::Beta::AutoComplete::Item",
           "Primer::Alpha::AutoComplete" => "Primer::Beta::AutoComplete",
           "Primer::BlankslateComponent" => "Primer::Beta::Blankslate",
           "Primer::BorderBoxComponent" => "Primer::Beta::BorderBox",
+          "Primer::BoxComponent" => "Primer::Box",
           "Primer::DropdownMenuComponent" => nil,
           "Primer::Tooltip" => "Primer::Alpha::Tooltip",
           "Primer::FlexComponent" => nil,

data/lib/primer/view_components/version.rb

@@ -5,7 +5,7 @@ module Primer
     module VERSION
       MAJOR = 0
       MINOR = 0
-      PATCH = 86
+      PATCH = 89
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end

data/lib/rubocop/cop/primer/component_name_migration.rb

@@ -15,6 +15,8 @@ module RuboCop
       # Primer::Beta::ComponentName.new()
       class ComponentNameMigration < BaseCop
         DEPRECATIONS = {
+          "Primer::BoxComponent" => "Primer::Box",
+          "Primer::ButtonGroup" => "Primer::Beta::ButtonGroup",
           "Primer::BlankslateComponent" => "Primer::Beta::Blankslate",
           "Primer::BorderBoxComponent" => "Primer::Beta::BorderBox",
           "Primer::BaseButton" => "Primer::Beta::BaseButton",

data/lib/rubocop/cop/primer/deprecated_label_variants.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "rubocop"
+
+# :nocov:
+module RuboCop
+  module Cop
+    module Primer
+      # This cop ensures that `LabelComponent`s don't use the old `variant` argument.
+      #
+      # bad
+      # Primer::LabelComponent.new(variant: :large)
+      #
+      # good
+      # Primer::LabelComponent.new(size: :large)
+      #
+      # bad
+      # Primer::LabelComponent.new(variant: :inline)
+      #
+      # good
+      # Primer::LabelComponent.new(inline: true)
+      class DeprecatedLabelVariants < BaseCop
+        def on_send(node)
+          return unless label_node?(node)
+          return unless node.arguments?
+
+          # we are looking for hash arguments and they are always last
+          kwargs = node.arguments.last
+
+          return unless kwargs.type == :hash
+
+          kwargs.pairs.each do |pair|
+            # skip if we're not dealing with a symbol or string
+            next if pair.key.type != :sym
+            next unless pair.value.type == :sym || pair.value.type == :str
+            next if pair.key.value != :variant
+
+            case pair.value.value
+            when :large, "large"
+              add_offense(pair, message: "Avoid using `variant: :large` with `LabelComponent`. Use `size: :large` instead.")
+            when :inline, "inline"
+              add_offense(pair, message: "Avoid using `variant: :inline` with `LabelComponent`. Use `inline: true` instead.")
+            end
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            replacement =
+              case node.value.value
+              when :large, "large"
+                "size: :large"
+              when :inline, "inline"
+                "inline: true"
+              end
+
+            corrector.replace(node, replacement)
+          end
+        end
+
+        private
+
+        def label_node?(node)
+          return if node.nil?
+
+          node.method_name == :new && !node.receiver.nil? && node.receiver.const_name == "Primer::LabelComponent"
+        end
+      end
+    end
+  end
+end

data/lib/tasks/docs.rake

@@ -44,10 +44,10 @@ namespace :docs do
       Primer::Beta::Blankslate,
       Primer::Beta::BorderBox,
       Primer::Beta::BorderBox::Header,
-      Primer::BoxComponent,
+      Primer::Box,
       Primer::Beta::Breadcrumbs,
       Primer::ButtonComponent,
-      Primer::ButtonGroup,
+      Primer::Beta::ButtonGroup,
       Primer::Alpha::ButtonMarketing,
       Primer::ClipboardCopy,
       Primer::CloseButton,

data/lib/yard/docs_helper.rb

@@ -28,7 +28,7 @@ module YARD
       prefix = "One of"
       prefix = prefix.downcase if lower
 
-      "#{prefix} #{values.to_sentence(last_word_connector: ', or ')}."
+      "#{prefix} #{values.to_sentence(two_words_connector: ' or ', last_word_connector: ', or ')}."
     end
 
     def link_to_accessibility