primer_view_components 0.0.29 → 0.0.34

data/app/lib/primer/classify.rb

@@ -3,12 +3,11 @@
 module Primer
   # :nodoc:
   class Classify
-    MARGIN_DIRECTION_KEYS = %i[mt ml mb mr].freeze
-    SPACING_KEYS = (%i[m my mx p py px pt pl pb pr] + MARGIN_DIRECTION_KEYS).freeze
     DIRECTION_KEY = :direction
     JUSTIFY_CONTENT_KEY = :justify_content
     ALIGN_ITEMS_KEY = :align_items
     DISPLAY_KEY = :display
+    SPACING_KEYS = Primer::Classify::Spacing::KEYS
     RESPONSIVE_KEYS = ([DISPLAY_KEY, DIRECTION_KEY, JUSTIFY_CONTENT_KEY, ALIGN_ITEMS_KEY, :col, :float] + SPACING_KEYS).freeze
     BREAKPOINTS = ["", "-sm", "-md", "-lg", "-xl"].freeze
 
@@ -184,16 +183,10 @@ module Primer
         return if val.nil? || val == ""
 
         if SPACING_KEYS.include?(key)
-          if MARGIN_DIRECTION_KEYS.include?(key)
-            raise ArgumentError, "value of #{key} must be between -6 and 6" if val < -6 || val > 6
-          elsif !((key == :mx || key == :my) && val == :auto)
-            raise ArgumentError, "value of #{key} must be between 0 and 6" if val.negative? || val > 6
-          end
-        end
-
-        if BOOLEAN_MAPPINGS.key?(key)
-          BOOLEAN_MAPPINGS[key][:mappings].map { |m| m[:css_class] if m[:value] == val }.compact.each do |css_class|
-            memo[:classes] << css_class
+          memo[:classes] << Primer::Classify::Spacing.spacing(key, val, breakpoint)
+        elsif BOOLEAN_MAPPINGS.key?(key)
+          BOOLEAN_MAPPINGS[key][:mappings].each do |m|
+            memo[:classes] << m[:css_class] if m[:value] == val && m[:css_class].present?
           end
         elsif key == BG_KEY
           if val.to_s.start_with?("#")
@@ -248,8 +241,6 @@ module Primer
           memo[:classes] << "text-#{val.to_s.dasherize}"
         elsif TYPOGRAPHY_KEYS.include?(key)
           memo[:classes] << "f#{val.to_s.dasherize}"
-        elsif MARGIN_DIRECTION_KEYS.include?(key) && val.negative?
-          memo[:classes] << "#{key.to_s.dasherize}#{breakpoint}-n#{val.abs}"
         elsif key == BOX_SHADOW_KEY
           memo[:classes] << if val == true
                               "color-shadow-small"

data/app/lib/primer/classify/cache.rb

@@ -20,13 +20,23 @@ module Primer
 
         def preload!
           preload(
-            keys: Primer::Classify::MARGIN_DIRECTION_KEYS,
-            values: [-6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6]
+            keys: Primer::Classify::Spacing::MARGIN_DIRECTION_MAPPINGS.keys,
+            values: Primer::Classify::Spacing::MARGIN_DIRECTION_OPTIONS
           )
 
           preload(
-            keys: (Primer::Classify::SPACING_KEYS - Primer::Classify::MARGIN_DIRECTION_KEYS),
-            values: [0, 1, 2, 3, 4, 5, 6]
+            keys: Primer::Classify::Spacing::BASE_MAPPINGS.keys,
+            values: Primer::Classify::Spacing::BASE_OPTIONS
+          )
+
+          preload(
+            keys: Primer::Classify::Spacing::AUTO_MAPPINGS.keys,
+            values: Primer::Classify::Spacing::AUTO_OPTIONS
+          )
+
+          preload(
+            keys: Primer::Classify::Spacing::RESPONSIVE_MAPPINGS.keys,
+            values: Primer::Classify::Spacing::RESPONSIVE_OPTIONS
           )
 
           preload(

data/app/lib/primer/classify/functional_colors.rb

@@ -29,16 +29,18 @@ module Primer
           functional_options:,
           options_without_mappigs: []
         )
+          sym_value = value.to_sym
+          dasherized_value = value.to_s.dasherize
           # the value is a functional color
-          return "#{number_prefix}-#{value.to_s.dasherize}" if ends_with_number?(value)
-          return "#{functional_prefix}-#{value.to_s.dasherize}" if functional_options.include?(value)
+          return "#{number_prefix}-#{dasherized_value}" if ends_with_number?(sym_value)
+          return "#{functional_prefix}-#{dasherized_value}" if functional_options.include?(sym_value)
           # if the app still allows non functional colors
-          return "#{non_functional_prefix}-#{value.to_s.dasherize}" unless force_functional_colors?
+          return "#{non_functional_prefix}-#{dasherized_value}" unless force_functional_colors?
 
-          if mappings.key?(value) || options_without_mappigs.include?(value)
-            functional_color = mappings[value]
+          if mappings.key?(sym_value) || options_without_mappigs.include?(sym_value)
+            functional_color = mappings[sym_value]
             # colors without functional mapping stay the same
-            return "#{non_functional_prefix}-#{value.to_s.dasherize}" if functional_color.blank?
+            return "#{non_functional_prefix}-#{dasherized_value}" if functional_color.blank?
 
             ActiveSupport::Deprecation.warn("#{key} #{value} is deprecated. Please use #{functional_color} instead.") unless Rails.env.production? || silence_deprecations?
 

data/app/lib/primer/classify/spacing.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Primer
+  class Classify
+    # Handler for PrimerCSS spacing classes.
+    class Spacing
+      BASE_OPTIONS = (0..6).to_a.freeze
+      BASE_MAPPINGS = {
+        my: BASE_OPTIONS,
+        pb: BASE_OPTIONS,
+        pl: BASE_OPTIONS,
+        pr: BASE_OPTIONS,
+        pt: BASE_OPTIONS,
+        px: BASE_OPTIONS,
+        py: BASE_OPTIONS
+      }.freeze
+
+      MARGIN_DIRECTION_OPTIONS = [*(-6..-1), *BASE_OPTIONS].freeze
+      MARGIN_DIRECTION_MAPPINGS = {
+        mb: MARGIN_DIRECTION_OPTIONS,
+        ml: MARGIN_DIRECTION_OPTIONS,
+        mr: MARGIN_DIRECTION_OPTIONS,
+        mt: MARGIN_DIRECTION_OPTIONS
+      }.freeze
+
+      AUTO_OPTIONS = [*BASE_OPTIONS, :auto].freeze
+      AUTO_MAPPINGS = {
+        m: AUTO_OPTIONS,
+        mx: AUTO_OPTIONS
+      }.freeze
+
+      RESPONSIVE_OPTIONS = [*BASE_OPTIONS, :responsive].freeze
+      RESPONSIVE_MAPPINGS = {
+        p: RESPONSIVE_OPTIONS
+      }.freeze
+
+      MAPPINGS = {
+        **BASE_MAPPINGS,
+        **MARGIN_DIRECTION_MAPPINGS,
+        **AUTO_MAPPINGS,
+        **RESPONSIVE_MAPPINGS
+      }.freeze
+      KEYS = MAPPINGS.keys.freeze
+
+      class << self
+        def spacing(key, val, breakpoint)
+          validate(key, val) unless Rails.env.production?
+
+          return "#{key.to_s.dasherize}#{breakpoint}-n#{val.abs}" if val.is_a?(Numeric) && val.negative?
+
+          "#{key.to_s.dasherize}#{breakpoint}-#{val.to_s.dasherize}"
+        end
+
+        private
+
+        def validate(key, val)
+          raise ArgumentError, "#{key} is not a spacing key" unless KEYS.include?(key)
+          raise ArgumentError, "#{val} is not a valid value for :#{key}. Use one of  #{MAPPINGS[key]}" unless MAPPINGS[key].include?(val)
+        end
+      end
+    end
+  end
+end

data/app/lib/primer/tabbed_component_helper.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Primer
+  # Helper to share tab validation logic between components.
+  # The component will raise an error if there are 0 or 2+ selected tabs.
+  module TabbedComponentHelper
+    extend ActiveSupport::Concern
+
+    class MultipleSelectedTabsError < StandardError; end
+
+    def before_render
+      validate_single_selected_tab unless Rails.env.production?
+    end
+
+    private
+
+    def wrapper
+      return yield unless @with_panel
+
+      render Primer::TabContainerComponent.new do
+        yield
+      end
+    end
+
+    def validate_single_selected_tab
+      raise MultipleSelectedTabsError, "only one tab can be selected" if selected_tabs_count > 1
+    end
+
+    def selected_tabs_count
+      @selected_tabs_count ||= tabs.count(&:selected)
+    end
+  end
+end

data/app/lib/primer/view_helper.rb

@@ -12,8 +12,8 @@ module Primer
     }.freeze
 
     HELPERS.each do |name, component|
-      define_method "primer_#{name}" do |**component_args, &block|
-        render component.constantize.new(**component_args), &block
+      define_method "primer_#{name}" do |*args, **kwargs, &block|
+        render component.constantize.new(*args, **kwargs), &block
       end
     end
   end

data/lib/primer/view_components/version.rb

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

data/static/statuses.json

@@ -1 +1 @@
-{"Primer::AutoCompleteComponent":"alpha","Primer::AutoCompleteItemComponent":"alpha","Primer::AvatarComponent":"beta","Primer::AvatarStackComponent":"alpha","Primer::BaseComponent":"beta","Primer::BlankslateComponent":"beta","Primer::BorderBoxComponent":"beta","Primer::BoxComponent":"stable","Primer::BreadcrumbComponent":"beta","Primer::BreadcrumbComponent::ItemComponent":"alpha","Primer::ButtonComponent":"alpha","Primer::ButtonGroupComponent":"alpha","Primer::ButtonMarketingComponent":"alpha","Primer::CounterComponent":"beta","Primer::DetailsComponent":"beta","Primer::Dropdown::MenuComponent":"alpha","Primer::DropdownComponent":"alpha","Primer::DropdownMenuComponent":"deprecated","Primer::FlashComponent":"beta","Primer::FlexComponent":"alpha","Primer::FlexItemComponent":"alpha","Primer::HeadingComponent":"beta","Primer::LabelComponent":"beta","Primer::LayoutComponent":"alpha","Primer::LinkComponent":"beta","Primer::MarkdownComponent":"alpha","Primer::MenuComponent":"alpha","Primer::OcticonComponent":"beta","Primer::PopoverComponent":"beta","Primer::ProgressBarComponent":"beta","Primer::SpinnerComponent":"beta","Primer::StateComponent":"beta","Primer::SubheadComponent":"beta","Primer::TabContainerComponent":"alpha","Primer::TabNavComponent":"alpha","Primer::TabNavComponent::TabComponent":"alpha","Primer::TextComponent":"beta","Primer::TimeAgoComponent":"alpha","Primer::TimelineItemComponent":"beta","Primer::TimelineItemComponent::BadgeComponent":"alpha","Primer::TooltipComponent":"alpha","Primer::TruncateComponent":"alpha","Primer::UnderlineNavComponent":"alpha"}
+{"Primer::AutoCompleteComponent":"alpha","Primer::AutoCompleteItemComponent":"alpha","Primer::AvatarComponent":"beta","Primer::AvatarStackComponent":"alpha","Primer::BaseComponent":"beta","Primer::BlankslateComponent":"beta","Primer::BorderBoxComponent":"beta","Primer::BoxComponent":"stable","Primer::BreadcrumbComponent":"beta","Primer::BreadcrumbComponent::ItemComponent":"alpha","Primer::ButtonComponent":"alpha","Primer::ButtonGroupComponent":"alpha","Primer::ButtonMarketingComponent":"alpha","Primer::CounterComponent":"beta","Primer::DetailsComponent":"beta","Primer::Dropdown::MenuComponent":"alpha","Primer::DropdownComponent":"alpha","Primer::DropdownMenuComponent":"deprecated","Primer::FlashComponent":"beta","Primer::FlexComponent":"alpha","Primer::FlexItemComponent":"alpha","Primer::HeadingComponent":"beta","Primer::LabelComponent":"beta","Primer::LayoutComponent":"alpha","Primer::LinkComponent":"beta","Primer::MarkdownComponent":"alpha","Primer::MenuComponent":"alpha","Primer::Navigation::TabComponent":"alpha","Primer::OcticonComponent":"beta","Primer::PopoverComponent":"beta","Primer::ProgressBarComponent":"beta","Primer::SpinnerComponent":"beta","Primer::StateComponent":"beta","Primer::SubheadComponent":"beta","Primer::TabContainerComponent":"alpha","Primer::TabNavComponent":"alpha","Primer::TextComponent":"beta","Primer::TimeAgoComponent":"beta","Primer::TimelineItemComponent":"beta","Primer::TimelineItemComponent::BadgeComponent":"alpha","Primer::TooltipComponent":"alpha","Primer::TruncateComponent":"alpha","Primer::UnderlineNavComponent":"alpha"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: primer_view_components
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.34
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octicons_helper
@@ -295,6 +295,8 @@ files:
 - app/components/primer/markdown_component.rb
 - app/components/primer/menu_component.html.erb
 - app/components/primer/menu_component.rb
+- app/components/primer/navigation/tab_component.html.erb
+- app/components/primer/navigation/tab_component.rb
 - app/components/primer/octicon_component.rb
 - app/components/primer/popover_component.html.erb
 - app/components/primer/popover_component.rb
@@ -303,7 +305,6 @@ files:
 - app/components/primer/primer.ts
 - app/components/primer/progress_bar_component.html.erb
 - app/components/primer/progress_bar_component.rb
-- app/components/primer/slot.rb
 - app/components/primer/spinner_component.html.erb
 - app/components/primer/spinner_component.rb
 - app/components/primer/state_component.rb
@@ -333,9 +334,11 @@ files:
 - app/lib/primer/classify/functional_border_colors.rb
 - app/lib/primer/classify/functional_colors.rb
 - app/lib/primer/classify/functional_text_colors.rb
+- app/lib/primer/classify/spacing.rb
 - app/lib/primer/fetch_or_fallback_helper.rb
 - app/lib/primer/join_style_arguments_helper.rb
 - app/lib/primer/status/dsl.rb
+- app/lib/primer/tabbed_component_helper.rb
 - app/lib/primer/test_selector_helper.rb
 - app/lib/primer/view_helper.rb
 - lib/primer/view_components.rb

data/app/components/primer/slot.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Primer
-  # @private
-  class Slot < ViewComponent::Slot
-    include ClassNameHelper
-    include FetchOrFallbackHelper
-    include JoinStyleArgumentsHelper
-  end
-end