primer_view_components 0.0.53 → 0.0.57

data/lib/primer/classify/utilities.rb

@@ -115,7 +115,11 @@ module Primer
         end
 
         def classes_to_args(classes)
-          classes_to_hash(classes).map do |key, value|
+          hash_to_args(classes_to_hash(classes))
+        end
+
+        def hash_to_args(hash)
+          hash.map do |key, value|
             val = case value
                   when Symbol
                     ":#{value}"
@@ -175,7 +179,7 @@ module Primer
           unless supported_value?(key, val)
             raise ArgumentError, "#{val} is not a valid value for :#{key}. Use one of #{mappings(key)}" unless ENV["RAILS_ENV"] == "production"
 
-            return ""
+            return "#{key.to_s.dasherize}-#{val.to_s.dasherize}"
           end
 
           nil

data/lib/primer/classify/utilities.yml

@@ -22,6 +22,39 @@
   - anim-hover-grow
   :rotate:
   - anim-rotate
+:color:
+  :text_primary:
+  - color-text-primary
+  :text_secondary:
+  - color-text-secondary
+  :text_tertiary:
+  - color-text-tertiary
+  :text_link:
+  - color-text-link
+  :text_success:
+  - color-text-success
+  :text_warning:
+  - color-text-warning
+  :text_danger:
+  - color-text-danger
+  :text_inverse:
+  - color-text-inverse
+  :text_white:
+  - color-text-white
+  :icon_primary:
+  - color-icon-primary
+  :icon_secondary:
+  - color-icon-secondary
+  :icon_tertiary:
+  - color-icon-tertiary
+  :icon_info:
+  - color-icon-info
+  :icon_danger:
+  - color-icon-danger
+  :icon_success:
+  - color-icon-success
+  :icon_warning:
+  - color-icon-warning
 :position:
   :static:
   - position-static
@@ -1220,6 +1253,8 @@
   - py-lg-12
   - py-xl-12
 :word_break:
+  :break_word:
+  - wb-break-word
   :break_all:
   - wb-break-all
 :display:

data/lib/primer/classify/validation.rb

@@ -6,7 +6,7 @@ module Primer
   class Classify
     # :nodoc:
     class Validation
-      INVALID_CLASS_NAME_PREFIXES = /bg-|color-|text-|box-shadow-|text-|box_shadow-/.freeze
+      INVALID_CLASS_NAME_PREFIXES = /bg-|color-bg-|text-|box-shadow-|box_shadow-/.freeze
 
       class << self
         def invalid?(class_name)

data/lib/primer/classify.rb

@@ -4,7 +4,6 @@ require_relative "classify/cache"
 require_relative "classify/flex"
 require_relative "classify/functional_background_colors"
 require_relative "classify/functional_border_colors"
-require_relative "classify/functional_text_colors"
 require_relative "classify/grid"
 require_relative "classify/utilities"
 require_relative "classify/validation"
@@ -15,7 +14,6 @@ module Primer
     # Keys where we can simply translate { key: value } into ".key-value"
     CONCAT_KEYS = %i[text box_shadow].freeze
 
-    COLOR_KEY = :color
     BG_KEY = :bg
     TEXT_KEYS = %i[font_family font_style font_weight text_align text_transform].freeze
     BOX_SHADOW_KEY = :box_shadow
@@ -88,7 +86,6 @@ module Primer
         BORDER_KEY,
         BORDER_COLOR_KEY,
         BORDER_RADIUS_KEY,
-        COLOR_KEY,
         BG_KEY,
         BOX_SHADOW_KEY,
         CONTAINER_KEY
@@ -176,8 +173,6 @@ module Primer
           else
             memo[:classes] << Primer::Classify::FunctionalBackgroundColors.color(val)
           end
-        elsif key == COLOR_KEY
-          memo[:classes] << Primer::Classify::FunctionalTextColors.color(val)
         elsif key == BORDER_KEY
           border_value = if val == true
                            "border"

data/lib/primer/view_components/engine.rb

@@ -7,7 +7,7 @@ module Primer
     # :nodoc:
     class Engine < ::Rails::Engine
       isolate_namespace Primer::ViewComponents
-      config.autoload_once_paths = %W[
+      config.eager_load_paths = %W[
         #{root}/app/components
         #{root}/app/lib
       ]

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

@@ -23,12 +23,13 @@ module ERBLint
           component: "Primer::BaseButton",
           constant: "TYPE_OPTIONS"
         ).freeze
+
         DEFAULT_TAG = Primer::ViewComponents::Constants.get(
           component: "Primer::BaseButton",
           constant: "DEFAULT_TAG"
         ).freeze
 
-        ATTRIBUTES = %w[disabled type].freeze
+        ATTRIBUTES = %w[disabled type href name value tabindex].freeze
 
         def attribute_to_args(attribute)
           attr_name = attribute.name
@@ -43,6 +44,8 @@ module ERBLint
             raise ConversionError, "Button component does not support type \"#{attribute.value}\"" unless TYPE_OPTIONS.include?(attribute.value)
 
             { type: ":#{attribute.value}" }
+          else
+            { attr_name.to_sym => erb_helper.convert(attribute) }
           end
         end
 

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

@@ -22,6 +22,11 @@ module ERBLint
         # Hash children indicates that there are tags in the content.
         return nil if tag_tree[:children].first.is_a?(Hash)
 
+        content = tag_tree[:children].first
+
+        # Don't accept content with ERB blocks
+        return nil if content.type != :text || content.children&.any? { |n| n.try(:type) == :erb }
+
         ARGUMENT_MAPPER.new(tag).to_s
       rescue ArgumentMappers::ConversionError
         nil

data/lib/primer/view_components/version.rb

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

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "rubocop"
+require "primer/view_components/statuses"
+require_relative "../../../../app/lib/primer/view_helper"
+
+module RuboCop
+  module Cop
+    module Primer
+      # :nodoc:
+      class BaseCop < RuboCop::Cop::Cop
+        # We only verify SystemArguments if it's a `.new` call on a component or
+        # a ViewHeleper call.
+        def valid_node?(node)
+          return if node.nil?
+
+          view_helpers.include?(node.method_name) || (node.method_name == :new && !node.receiver.nil? && ::Primer::ViewComponents::STATUSES.key?(node.receiver.const_name))
+        end
+
+        private
+
+        def view_helpers
+          ::Primer::ViewHelper::HELPERS.keys.map { |key| "primer_#{key}".to_sym }
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "rubocop"
-require "primer/view_components/statuses"
-require_relative "../../../../app/lib/primer/view_helper"
 
 # :nocov:
 module RuboCop
@@ -15,7 +13,7 @@ module RuboCop
       #
       # good
       # Component.new(foo: :bar)
-      class DeprecatedArguments < RuboCop::Cop::Cop
+      class DeprecatedArguments < BaseCop
         INVALID_MESSAGE = <<~STR
           Avoid using deprecated arguments: https://primer.style/view-components/deprecated.
         STR
@@ -35,6 +33,110 @@ module RuboCop
         # }
         #
         DEPRECATED = {
+          bg: {
+            white: "bg: :primary",
+            gray_light: "bg: :secondary",
+            gray: "bg: :tertiary",
+            gray_dark: "bg: :canvas_inverse",
+            blue_light: "bg: :info",
+            blue: "bg: :info_inverse",
+            green_light: "bg: :success",
+            green: "bg: :success_inverse",
+            yellow_light: "bg: :warning",
+            yellow: "bg: :warning_inverse",
+            red_light: "bg: :danger",
+            red: "bg: :danger_inverse",
+            gray_0: nil,
+            gray_1: nil,
+            gray_2: nil,
+            gray_3: nil,
+            gray_4: nil,
+            gray_5: nil,
+            gray_6: nil,
+            gray_7: nil,
+            gray_8: nil,
+            gray_9: nil,
+            blue_0: nil,
+            blue_1: nil,
+            blue_2: nil,
+            blue_3: nil,
+            blue_4: nil,
+            blue_5: nil,
+            blue_6: nil,
+            blue_7: nil,
+            blue_8: nil,
+            blue_9: nil,
+            green_0: nil,
+            green_1: nil,
+            green_2: nil,
+            green_3: nil,
+            green_4: nil,
+            green_5: nil,
+            green_6: nil,
+            green_7: nil,
+            green_8: nil,
+            green_9: nil,
+            yellow_0: nil,
+            yellow_1: nil,
+            yellow_2: nil,
+            yellow_3: nil,
+            yellow_4: nil,
+            yellow_5: nil,
+            yellow_6: nil,
+            yellow_7: nil,
+            yellow_8: nil,
+            yellow_9: nil,
+            red_0: nil,
+            red_1: nil,
+            red_2: nil,
+            red_3: nil,
+            red_4: nil,
+            red_5: nil,
+            red_6: nil,
+            red_7: nil,
+            red_8: nil,
+            red_9: nil,
+            purple_0: nil,
+            purple_1: nil,
+            purple_2: nil,
+            purple_3: nil,
+            purple_4: nil,
+            purple_5: nil,
+            purple_6: nil,
+            purple_7: nil,
+            purple_8: nil,
+            purple_9: nil,
+            pink_0: nil,
+            pink_1: nil,
+            pink_2: nil,
+            pink_3: nil,
+            pink_4: nil,
+            pink_5: nil,
+            pink_6: nil,
+            pink_7: nil,
+            pink_8: nil,
+            pink_9: nil,
+            orange_0: nil,
+            orange_1: nil,
+            orange_2: nil,
+            orange_3: nil,
+            orange_4: nil,
+            orange_5: nil,
+            orange_6: nil,
+            orange_7: nil,
+            orange_8: nil,
+            orange_9: nil
+          },
+          border_color: {
+            gray: "border_color: :primary",
+            gray_light: "border_color: :secondary",
+            gray_dark: "border_color: :tertiary",
+            blue: "border_color: :info",
+            green: "border_color: :success",
+            yellow: "border_color: :warning",
+            red: "border_color: :danger",
+            white: "border_color: :inverse"
+          },
           color: {
             blue: "color: :text_link",
             gray_dark: "color: :text_primary",
@@ -155,18 +257,6 @@ module RuboCop
             corrector.replace(node, replacement) if replacement.present?
           end
         end
-
-        private
-
-        # We only verify SystemArguments if it's a `.new` call on a component or
-        # a ViewHleper call.
-        def valid_node?(node)
-          view_helpers.include?(node.method_name) || (node.method_name == :new && ::Primer::ViewComponents::STATUSES.key?(node.receiver.const_name))
-        end
-
-        def view_helpers
-          ::Primer::ViewHelper::HELPERS.keys.map { |key| "primer_#{key}".to_sym }
-        end
       end
     end
   end

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

@@ -128,12 +128,29 @@ module RuboCop
           string_args = string_args_to_string(node)
 
           args = "#{args}, #{size_attributes_to_string(size_attributes)}" if size_args.present?
-          args = "#{args}, #{::Primer::Classify::Utilities.classes_to_args(classes)}" if classes.present?
+          args = "#{args}, #{utilities_args(classes)}" if classes.present?
           args = "#{args}, #{string_args}" if string_args.present?
 
           args
         end
 
+        def utilities_args(classes)
+          args = ::Primer::Classify::Utilities.classes_to_hash(classes)
+
+          color = case args[:color]
+                  when :text_white
+                    :text_white
+                  when :text_link
+                    :icon_info
+                  when Symbol
+                    args[:color].to_s.gsub("text_", "icon_").to_sym
+                  end
+
+          args[:color] = color if color
+
+          ::Primer::Classify::Utilities.hash_to_args(args)
+        end
+
         def size_attributes_to_string(size_attributes)
           # No arguments if they map to the default size
           return if size_attributes.blank? || size_attributes.values.all?(&:blank?)

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

@@ -2,8 +2,6 @@
 
 require "rubocop"
 require "primer/classify/utilities"
-require "primer/view_components/statuses"
-require_relative "../../../../app/lib/primer/view_helper"
 
 # :nocov:
 module RuboCop
@@ -16,7 +14,7 @@ module RuboCop
       #
       # good
       # Component.new(mr: 1)
-      class SystemArgumentInsteadOfClass < RuboCop::Cop::Cop
+      class SystemArgumentInsteadOfClass < BaseCop
         INVALID_MESSAGE = <<~STR
           Avoid using CSS classes when you can use System Arguments: https://primer.style/view-components/system-arguments.
         STR
@@ -53,18 +51,6 @@ module RuboCop
             corrector.replace(node.loc.expression, args)
           end
         end
-
-        private
-
-        # We only verify SystemArguments if it's a `.new` call on a component or
-        # a ViewHleper call.
-        def valid_node?(node)
-          view_helpers.include?(node.method_name) || (node.method_name == :new && ::Primer::ViewComponents::STATUSES.key?(node.receiver.const_name))
-        end
-
-        def view_helpers
-          ::Primer::ViewHelper::HELPERS.keys.map { |key| "primer_#{key}".to_sym }
-        end
       end
     end
   end

data/lib/tasks/docs.rake

@@ -40,7 +40,7 @@ namespace :docs do
       Primer::BlankslateComponent,
       Primer::BorderBoxComponent,
       Primer::BoxComponent,
-      Primer::BreadcrumbComponent,
+      Primer::Beta::Breadcrumbs,
       Primer::ButtonComponent,
       Primer::ButtonGroup,
       Primer::Alpha::ButtonMarketing,
@@ -68,14 +68,15 @@ namespace :docs do
       Primer::SpinnerComponent,
       Primer::SubheadComponent,
       Primer::TabContainerComponent,
-      Primer::TabNavComponent,
       Primer::Beta::Text,
       Primer::TimeAgoComponent,
       Primer::TimelineItemComponent,
       Primer::Tooltip,
       Primer::Truncate,
       Primer::Beta::Truncate,
-      Primer::UnderlineNavComponent
+      Primer::Alpha::UnderlineNav,
+      Primer::Alpha::TabNav,
+      Primer::Alpha::TabPanels
     ]
 
     js_components = [
@@ -85,9 +86,9 @@ namespace :docs do
       Primer::Beta::AutoComplete,
       Primer::ClipboardCopy,
       Primer::TabContainerComponent,
-      Primer::TabNavComponent,
       Primer::TimeAgoComponent,
-      Primer::UnderlineNavComponent
+      Primer::Alpha::UnderlinePanels,
+      Primer::Alpha::TabPanels
     ]
 
     all_components = Primer::Component.descendants - [Primer::BaseComponent]
@@ -205,7 +206,7 @@ namespace :docs do
             f.puts
             f.puts("### `#{slot_documentation.name.to_s.capitalize}`")
 
-            if slot_documentation.base_docstring.present?
+            if slot_documentation.base_docstring.to_s.present?
               f.puts
               f.puts(view_context.render(inline: slot_documentation.base_docstring))
             end