primer_view_components 0.0.24 → 0.0.29

data/app/components/primer/popover_component.html.erb

@@ -1,10 +1,6 @@
 <%= render Primer::BaseComponent.new(**@system_arguments) do %>
-  <%= render body.component do %>
-    <% if heading %>
-      <%= render heading.component do %>
-        <%= heading.content %>
-      <% end %>
-    <% end %>
-    <%= body.content %>
+  <%= render(body_component) do %>
+    <%= heading %>
+    <%= body %>
   <% end %>
 <% end %>

data/app/components/primer/popover_component.rb

@@ -5,37 +5,84 @@ module Primer
   #
   # By default, the popover renders with absolute positioning, meaning it should usually be wrapped in an element with a relative position in order to be positioned properly. To render the popover with relative positioning, use the relative property.
   class PopoverComponent < Primer::Component
-    include ViewComponent::Slotable
+    include ViewComponent::SlotableV2
+    status :beta
 
-    with_slot :heading, class_name: "Heading"
-    with_slot :body, class_name: "Body"
+    CARET_DEFAULT = :top
+    CARET_MAPPINGS = {
+      CARET_DEFAULT => "",
+      :bottom => "Popover-message--bottom",
+      :bottom_right => "Popover-message--bottom-right",
+      :bottom_left => "Popover-message--bottom-left",
+      :left => "Popover-message--left",
+      :left_bottom => "Popover-message--left-bottom",
+      :left_top => "Popover-message--left-top",
+      :right => "Popover-message--right",
+      :right_bottom => "Popover-message--right-bottom",
+      :right_top => "Popover-message--right-top",
+      :top_left => "Popover-message--top-left",
+      :top_right => "Popover-message--top-right"
+    }.freeze
+
+    # The heading
+    #
+    # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+    renders_one :heading, lambda { |**system_arguments|
+      system_arguments[:mb] ||= 2
+      system_arguments[:tag] ||= :h4
+
+      Primer::HeadingComponent.new(**system_arguments)
+    }
+
+    # The body
+    #
+    # @param caret [Symbol] <%= one_of(Primer::PopoverComponent::CARET_MAPPINGS.keys) %>
+    # @param large [Boolean] Whether to use the large version of the component.
+    # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+    renders_one :body, lambda { |caret: CARET_DEFAULT, large: false, **system_arguments, &block|
+      system_arguments[:classes] = class_names(
+        system_arguments[:classes],
+        "Popover-message Box",
+        CARET_MAPPINGS[fetch_or_fallback(CARET_MAPPINGS.keys, caret, CARET_DEFAULT)],
+        "Popover-message--large" => large
+      )
+      system_arguments[:p] ||= 4
+      system_arguments[:mt] ||= 2
+      system_arguments[:mx] ||= :auto
+      system_arguments[:text_align] ||= :left
+      system_arguments[:box_shadow] ||= :large
+
+      # This is a hack to allow the parent to set the slot's content
+      @body_arguments = system_arguments
+      block&.call
+    }
 
     # @example Default
     #   <%= render Primer::PopoverComponent.new do |component| %>
-    #     <% component.slot(:heading) do %>
+    #     <% component.heading do %>
     #       Activity feed
     #     <% end %>
-    #     <% component.slot(:body) do %>
+    #     <% component.body do %>
     #       This is the Popover body.
     #     <% end %>
     #   <% end %>
     #
     # @example Large
     #   <%= render Primer::PopoverComponent.new do |component| %>
-    #     <% component.slot(:heading) do %>
+    #     <% component.heading do %>
     #       Activity feed
     #     <% end %>
-    #     <% component.slot(:body, large: true) do %>
+    #     <% component.body(large: true) do %>
     #       This is the large Popover body.
     #     <% end %>
     #   <% end %>
     #
     # @example Caret position
     #   <%= render Primer::PopoverComponent.new do |component| %>
-    #     <% component.slot(:heading) do %>
+    #     <% component.heading do %>
     #       Activity feed
     #     <% end %>
-    #     <% component.slot(:body, caret: :left) do %>
+    #     <% component.body(caret: :left) do %>
     #       This is the large Popover body.
     #     <% end %>
     #   <% end %>
@@ -57,59 +104,8 @@ module Primer
       body.present?
     end
 
-    # :nodoc:
-    class Heading < Primer::Slot
-      # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-      def initialize(**system_arguments)
-        @system_arguments = system_arguments
-        @system_arguments[:mb] ||= 2
-        @system_arguments[:tag] ||= :h4
-      end
-
-      def component
-        Primer::HeadingComponent.new(**@system_arguments)
-      end
-    end
-
-    # :nodoc:
-    class Body < Slot
-      CARET_DEFAULT = :top
-      CARET_MAPPINGS = {
-        CARET_DEFAULT => "",
-        :bottom => "Popover-message--bottom",
-        :bottom_right => "Popover-message--bottom-right",
-        :bottom_left => "Popover-message--bottom-left",
-        :left => "Popover-message--left",
-        :left_bottom => "Popover-message--left-bottom",
-        :left_top => "Popover-message--left-top",
-        :right => "Popover-message--right",
-        :right_bottom => "Popover-message--right-bottom",
-        :right_top => "Popover-message--right-top",
-        :top_left => "Popover-message--top-left",
-        :top_right => "Popover-message--top-right"
-      }.freeze
-
-      # @param caret [Symbol] <%= one_of(Primer::PopoverComponent::Body::CARET_MAPPINGS.keys) %>
-      # @param large [Boolean] Whether to use the large version of the component.
-      # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-      def initialize(caret: CARET_DEFAULT, large: false, **system_arguments)
-        @system_arguments = system_arguments
-        @system_arguments[:classes] = class_names(
-          system_arguments[:classes],
-          "Popover-message Box",
-          CARET_MAPPINGS[fetch_or_fallback(CARET_MAPPINGS.keys, caret, CARET_DEFAULT)],
-          "Popover-message--large" => large
-        )
-        @system_arguments[:p] ||= 4
-        @system_arguments[:mt] ||= 2
-        @system_arguments[:mx] ||= :auto
-        @system_arguments[:text_align] ||= :left
-        @system_arguments[:box_shadow] ||= :large
-      end
-
-      def component
-        Primer::BoxComponent.new(**@system_arguments)
-      end
+    def body_component
+      Primer::BoxComponent.new(**@body_arguments)
     end
   end
 end

data/app/components/primer/primer.d.ts

@@ -0,0 +1,3 @@
+import './auto_complete_component';
+import './tab_container_component';
+import './time_ago_component';

data/app/components/primer/primer.js

@@ -1 +1,3 @@
+import './auto_complete_component';
 import './tab_container_component';
+import './time_ago_component';

data/app/components/primer/primer.ts

@@ -1 +1,3 @@
+import './auto_complete_component'
 import './tab_container_component'
+import './time_ago_component'

data/app/components/primer/progress_bar_component.rb

@@ -4,13 +4,14 @@ module Primer
   # Use ProgressBar to visualize task completion.
   class ProgressBarComponent < Primer::Component
     include ViewComponent::SlotableV2
+    status :beta
 
     # Use the Item slot to add an item to the progress bas
     #
     # @param percentage [Integer] The percent complete
     # @param bg [Symbol] The background color
     # @param kwargs [Hash] The same arguments as <%= link_to_system_arguments_docs %>.
-    renders_many :items, lambda { |percentage: 0, bg: :green, **system_arguments|
+    renders_many :items, lambda { |percentage: 0, bg: :success_inverse, **system_arguments|
       percentage = percentage
       system_arguments = system_arguments
 
@@ -38,19 +39,19 @@ module Primer
     #
     # @example Small
     #   <%= render(Primer::ProgressBarComponent.new(size: :small)) do |component| %>
-    #     <% component.item(bg: :blue_4, percentage: 50) %>
+    #     <% component.item(bg: :info_inverse, percentage: 50) %>
     #   <% end %>
     #
     # @example Large
     #   <%= render(Primer::ProgressBarComponent.new(size: :large)) do |component| %>
-    #     <% component.item(bg: :red_4, percentage: 75) %>
+    #     <% component.item(bg: :danger_inverse, percentage: 75) %>
     #   <% end %>
     #
     # @example Multiple items
     #   <%= render(Primer::ProgressBarComponent.new) do |component| %>
     #     <% component.item(percentage: 10) %>
-    #     <% component.item(bg: :blue_4, percentage: 20) %>
-    #     <% component.item(bg: :red_4, percentage: 30) %>
+    #     <% component.item(bg: :info_inverse, percentage: 20) %>
+    #     <% component.item(bg: :danger_inverse, percentage: 30) %>
     #   <% end %>
     #
     # @param size [Symbol] <%= one_of(Primer::ProgressBarComponent::SIZE_OPTIONS) %> Increases height.

data/app/components/primer/spinner_component.rb

@@ -3,6 +3,8 @@
 module Primer
   # Use Primer::SpinnerComponent to let users know that content is being loaded.
   class SpinnerComponent < Primer::Component
+    status :beta
+
     DEFAULT_SIZE = :medium
     SIZE_MAPPINGS = {
       :small => 16,
@@ -34,9 +36,5 @@ module Primer
       @system_arguments[:viewBox] = "0 0 16 16"
       @system_arguments[:fill] = :none
     end
-
-    def self.status
-      Primer::Component::STATUSES[:beta]
-    end
   end
 end

data/app/components/primer/state_component.rb

@@ -3,6 +3,8 @@
 module Primer
   # Component for rendering the status of an item.
   class StateComponent < Primer::Component
+    status :beta
+
     COLOR_DEFAULT = :default
     NEW_COLOR_MAPPINGS = {
       open: "State--open",
@@ -68,9 +70,5 @@ module Primer
     def call
       render(Primer::BaseComponent.new(**@system_arguments)) { content }
     end
-
-    def self.status
-      Primer::Component::STATUSES[:beta]
-    end
   end
 end

data/app/components/primer/subhead_component.rb

@@ -3,6 +3,8 @@
 module Primer
   # Use the Subhead component for page headings.
   class SubheadComponent < Primer::Component
+    status :beta
+
     include ViewComponent::SlotableV2
 
     # The heading

data/app/components/primer/tab_container_component.d.ts

@@ -0,0 +1 @@
+import '@github/tab-container-element';

data/app/components/primer/text_component.rb

@@ -3,9 +3,11 @@
 module Primer
   # The Text component is a wrapper component that will apply typography styles to the text inside.
   class TextComponent < Primer::Component
+    status :beta
+
     # @example Default
     #   <%= render(Primer::TextComponent.new(tag: :p, font_weight: :bold)) { "Bold Text" } %>
-    #   <%= render(Primer::TextComponent.new(tag: :p, color: :red_5)) { "Red Text" } %>
+    #   <%= render(Primer::TextComponent.new(tag: :p, color: :text_danger)) { "Danger Text" } %>
     #
     # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
     def initialize(**system_arguments)

data/app/components/primer/time_ago_component.d.ts

@@ -0,0 +1 @@
+import '@github/time-elements';

data/app/components/primer/time_ago_component.js

@@ -0,0 +1 @@
+import '@github/time-elements';

data/app/components/primer/time_ago_component.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Primer
+  # Use Primer::TimeAgoComponent to display a time relative to how long ago it was. This component requires JavaScript.
+  class TimeAgoComponent < Primer::Component
+    #
+    # @example Default
+    #   <%= render(Primer::TimeAgoComponent.new(time: Time.at(628232400))) %>
+    #
+    # @param time [Time] The time to be formatted
+    # @param micro [Boolean] If true then the text will be formatted in "micro" mode, using as few characters as possible
+    # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+    def initialize(time:, micro: false, **system_arguments)
+      @system_arguments = system_arguments
+      @system_arguments[:datetime] = time.utc.iso8601
+      @system_arguments[:classes] = class_names("no-wrap", @system_arguments[:classes])
+      @system_arguments[:tag] = "time-ago"
+      @system_arguments[:format] = "micro" if micro
+      @time = time
+      @micro = micro
+    end
+
+    def call
+      render(Primer::BaseComponent.new(**@system_arguments)) { time_in_words }
+    end
+
+    private
+
+    def time_in_words
+      return @time.in_time_zone.strftime("%b %-d, %Y") unless @micro
+
+      seconds_ago = Time.current - @time
+
+      if seconds_ago < 1.minute
+        "1m"
+      elsif seconds_ago >= 1.minute && seconds_ago < 1.hour
+        "#{(seconds_ago / 60).floor}m"
+      elsif seconds_ago >= 1.hour && seconds_ago < 1.day
+        "#{(seconds_ago / 60 / 60).floor}h"
+      elsif seconds_ago >= 1.day && seconds_ago < 1.year
+        "#{(seconds_ago / 60 / 60 / 24).floor}d"
+      elsif seconds_ago >= 1.year
+        "#{(seconds_ago / 60 / 60 / 24 / 365).floor}y"
+      end
+    end
+  end
+end

data/app/components/primer/time_ago_component.ts

@@ -0,0 +1 @@
+import '@github/time-elements'

data/app/components/primer/timeline_item_component.rb

@@ -4,6 +4,7 @@ module Primer
   # Use `TimelineItem` to display items on a vertical timeline, connected by badge elements.
   class TimelineItemComponent < Primer::Component
     include ViewComponent::SlotableV2
+    status :beta
 
     # Avatar to be rendered to the left of the Badge.
     #
@@ -40,7 +41,7 @@ module Primer
     #   <div style="padding-left: 60px">
     #     <%= render(Primer::TimelineItemComponent.new) do |component| %>
     #       <% component.avatar(src: "https://github.com/github.png", alt: "github") %>
-    #       <% component.badge(bg: :green, color: :white, icon: :check) %>
+    #       <% component.badge(bg: :success_inverse, color: :text_white, icon: :check) %>
     #       <% component.body { "Success!" } %>
     #     <% end %>
     #   </div>

data/app/components/primer/underline_nav_component.html.erb

@@ -1,11 +1,11 @@
 <%= render Primer::BaseComponent.new(**@system_arguments) do %>
-  <% if actions && @align == :right %>
+  <% if @align == :right %>
     <%= actions %>
   <% end %>
-  <%= render Primer::BaseComponent.new(tag: :ul, classes: "UnderlineNav-body list-style-none") do %>
-    <%= body %>
-  <% end %>
-  <% if actions && @align == :left %>
+
+  <%= body %>
+
+  <% if @align == :left %>
     <%= actions %>
   <% end %>
 <% end %>

data/app/components/primer/underline_nav_component.rb

@@ -5,27 +5,46 @@ module Primer
   # underlined selected state, typically used for navigation placed at the top
   # of the page.
   class UnderlineNavComponent < Primer::Component
+    include ViewComponent::SlotableV2
+
     ALIGN_DEFAULT = :left
     ALIGN_OPTIONS = [ALIGN_DEFAULT, :right].freeze
 
-    with_content_areas :body, :actions
+    #  Use the body for the navigation items
+    #
+    # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+    renders_one :body, lambda { |**system_arguments|
+      system_arguments[:classes] = class_names("UnderlineNav-body", "list-style-none", system_arguments[:classes])
+      system_arguments[:tag] ||= :ul
+
+      Primer::BaseComponent.new(**system_arguments) { content }
+    }
+
+    #  Use actions for a call to action
+    #
+    # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+    renders_one :actions, lambda { |**system_arguments|
+      system_arguments[:tag] ||= :div
+      system_arguments[:classes] = class_names("UnderlineNav-actions", system_arguments[:classes])
+      Primer::BaseComponent.new(**system_arguments) { content }
+    }
 
     # @example Default
     #   <%= render(Primer::UnderlineNavComponent.new) do |component| %>
-    #     <% component.with(:body) do %>
+    #     <% component.body do %>
     #       <%= render(Primer::LinkComponent.new(href: "#url")) { "Item 1" } %>
     #     <% end %>
-    #     <% component.with(:actions) do %>
+    #     <% component.actions do %>
     #       <%= render(Primer::ButtonComponent.new) { "Button!" } %>
     #     <% end %>
     #   <% end %>
     #
     # @example Align right
     #   <%= render(Primer::UnderlineNavComponent.new(align: :right)) do |component| %>
-    #     <% component.with(:body) do %>
+    #     <% component.body do %>
     #       <%= render(Primer::LinkComponent.new(href: "#url")) { "Item 1" } %>
     #     <% end %>
-    #     <% component.with(:actions) do %>
+    #     <% component.actions do %>
     #       <%= render(Primer::ButtonComponent.new) { "Button!" } %>
     #     <% end %>
     #   <% end %>

data/app/lib/primer/classify.rb

@@ -17,7 +17,6 @@ module Primer
 
     INVALID_CLASS_NAME_PREFIXES =
       (["bg-", "color-", "text-", "d-", "v-align-", "wb-", "text-", "box-shadow-"] + CONCAT_KEYS.map { |k| "#{k}-" }).freeze
-    FUNCTIONAL_COLOR_REGEX = /(primary|secondary|tertiary|link|success|warning|danger|info)/.freeze
 
     COLOR_KEY = :color
     BG_KEY = :bg
@@ -80,18 +79,20 @@ module Primer
         ]
       }
     }.freeze
-    BORDER_KEYS = %i[border border_color].freeze
+    BORDER_KEY = :border
+    BORDER_COLOR_KEY = :border_color
     BORDER_MARGIN_KEYS = %i[border_top border_bottom border_left border_right].freeze
     BORDER_RADIUS_KEY = :border_radius
     TYPOGRAPHY_KEYS = [:font_size].freeze
     VALID_KEYS = (
       CONCAT_KEYS +
       BOOLEAN_MAPPINGS.keys +
-      BORDER_KEYS +
       BORDER_MARGIN_KEYS +
       TYPOGRAPHY_KEYS +
       TEXT_KEYS +
       [
+        BORDER_KEY,
+        BORDER_COLOR_KEY,
         BORDER_RADIUS_KEY,
         COLOR_KEY,
         BG_KEY,
@@ -198,25 +199,17 @@ module Primer
           if val.to_s.start_with?("#")
             memo[:styles] << "background-color: #{val};"
           else
-            memo[:classes] << "bg-#{val.to_s.dasherize}"
+            memo[:classes] << Primer::Classify::FunctionalBackgroundColors.color(val)
           end
         elsif key == COLOR_KEY
-          char_code = val[-1].ord
-          # Does this string end in a character that is NOT a number?
-          memo[:classes] <<
-            if (char_code >= 48 && char_code <= 57) || # 48 is the charcode for 0; 57 is the charcode for 9
-               FUNCTIONAL_COLOR_REGEX.match?(val)
-              "color-#{val.to_s.dasherize}"
-            else
-              "text-#{val.to_s.dasherize}"
-            end
+          memo[:classes] << Primer::Classify::FunctionalTextColors.color(val)
         elsif key == DISPLAY_KEY
           memo[:classes] << "d#{breakpoint}-#{val.to_s.dasherize}"
         elsif key == VERTICAL_ALIGN_KEY
           memo[:classes] << "v-align-#{val.to_s.dasherize}"
         elsif key == WORD_BREAK_KEY
           memo[:classes] << "wb-#{val.to_s.dasherize}"
-        elsif BORDER_KEYS.include?(key)
+        elsif key == BORDER_KEY
           border_value = if val == true
                            "border"
                          else
@@ -224,6 +217,8 @@ module Primer
                          end
 
           memo[:classes] << border_value
+        elsif key == BORDER_COLOR_KEY
+          memo[:classes] << Primer::Classify::FunctionalBorderColors.color(val)
         elsif BORDER_MARGIN_KEYS.include?(key)
           memo[:classes] << "#{key.to_s.dasherize}-#{val}"
         elsif key == BORDER_RADIUS_KEY
@@ -257,9 +252,11 @@ module Primer
           memo[:classes] << "#{key.to_s.dasherize}#{breakpoint}-n#{val.abs}"
         elsif key == BOX_SHADOW_KEY
           memo[:classes] << if val == true
-                              "box-shadow"
+                              "color-shadow-small"
+                            elsif val == :none || val.blank?
+                              "box-shadow-none"
                             else
-                              "box-shadow-#{val.to_s.dasherize}"
+                              "color-shadow-#{val.to_s.dasherize}"
                             end
         elsif key == VISIBILITY_KEY
           memo[:classes] << "v-#{val.to_s.dasherize}"