primer_view_components 0.42.0 → 0.43.1

data/app/components/primer/alpha/dialog/header.html.erb

@@ -13,7 +13,7 @@
       <% end %>
     </div>
     <div class="Overlay-actionWrap">
-      <%= render Primer::Beta::CloseButton.new(classes: "Overlay-closeButton", "data-close-dialog-id": @id) %>
+      <%= render Primer::Beta::CloseButton.new(classes: "Overlay-closeButton", "data-close-dialog-id": @id, aria: { label: @close_label }) %>
     </div>
   </div>
   <%= filter %>

data/app/components/primer/alpha/dialog/header.rb

@@ -16,6 +16,8 @@ module Primer
         }.freeze
         VARIANT_OPTIONS = VARIANT_MAPPINGS.keys
 
+        DEFAULT_CLOSE_LABEL = "Close"
+
         # Optional filter slot for adding a filter input to the header.
         #
         # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
@@ -48,6 +50,7 @@ module Primer
         # @param show_divider [Boolean] Show a divider between the header and body.
         # @param visually_hide_title [Boolean] Visually hide the `title` while maintaining a label for assistive technologies.
         # @param variant [Symbol] <%= one_of(Primer::Alpha::Dialog::Header::VARIANT_OPTIONS) %>
+        # @param close_label [String] The aria-label text of the close "x" button.
         # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
         def initialize(
           id:,
@@ -56,12 +59,14 @@ module Primer
           show_divider: false,
           visually_hide_title: false,
           variant: DEFAULT_VARIANT,
+          close_label: DEFAULT_CLOSE_LABEL,
           **system_arguments
         )
           @id = id
           @title = title
           @subtitle = subtitle
           @visually_hide_title = visually_hide_title
+          @close_label = close_label
           @system_arguments = deny_tag_argument(**system_arguments)
           @system_arguments[:tag] = :div
 

data/app/components/primer/alpha/include_fragment.rb

@@ -8,14 +8,27 @@ module Primer
     class IncludeFragment < Primer::Component
       status :alpha
 
+      ALLOWED_LOADING_VALUES = [:lazy, :eager].freeze
+      DEFAULT_LOADING = :eager
+
       # @param src [String] The URL  from which to retrieve an HTML element fragment.
       # @param loading [Symbol] <%= one_of([:lazy, :eager]) %>
+      # @param accept [String] What to send as the Accept header.
       # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-      def initialize(src: nil, loading: :eager, **system_arguments)
+      def initialize(src: nil, loading: nil, accept: nil, **system_arguments)
         @system_arguments = system_arguments
         @system_arguments[:tag] = "include-fragment"
         @system_arguments[:loading] = loading
         @system_arguments[:src] = src
+        @system_arguments[:accept] = accept if accept
+
+        if loading
+          @system_arguments[:loading] = fetch_or_fallback(ALLOWED_LOADING_VALUES, loading.to_sym, DEFAULT_LOADING)
+        end
+
+        if Primer::CurrentAttributes.nonce
+          @system_arguments[:"data-nonce"] = Primer::CurrentAttributes.nonce
+        end
       end
 
       def call

data/app/components/primer/alpha/select_panel.css

@@ -1 +1 @@
-.SelectPanel-emptyPanel,.SelectPanel-loadingPanel{min-height:min(var(--overlay-height) - 10rem,100vh - 2rem)}
+.SelectPanel-loadingPanel{min-height:min(calc(var(--overlay-height) - 10rem),calc(100vh - 2rem))}.SelectPanel-emptyPanel{align-items:center;display:flex;justify-content:center;min-height:min(calc(var(--overlay-height) - 23rem),calc(100vh - 2rem))}

data/app/components/primer/alpha/select_panel.css.json

@@ -1,7 +1,7 @@
 {
   "name": "alpha/select_panel",
   "selectors": [
-    ".SelectPanel-emptyPanel",
-    ".SelectPanel-loadingPanel"
+    ".SelectPanel-loadingPanel",
+    ".SelectPanel-emptyPanel"
   ]
 }

data/app/components/primer/alpha/select_panel.css.map

@@ -1 +1 @@
-{"version":3,"sources":["select_panel.pcss"],"names":[],"mappings":"AAIA,kDACE,0DACF","file":"select_panel.css","sourcesContent":[".SelectPanel-loadingPanel {\n  min-height: min(var(--overlay-height) - 10rem, 100vh - 2rem);\n}\n\n.SelectPanel-emptyPanel {\n  min-height: min(var(--overlay-height) - 10rem, 100vh - 2rem);\n}\n"]}
+{"version":3,"sources":["select_panel.pcss"],"names":[],"mappings":"AAAA,0BACE,sEACF,CAEA,wBAEE,kBAAmB,CACnB,YAAa,CACb,sBAAuB,CAHvB,sEAIF","file":"select_panel.css","sourcesContent":[".SelectPanel-loadingPanel {\n  min-height: min(calc(var(--overlay-height) - 10rem), calc(100vh - 2rem));\n}\n\n.SelectPanel-emptyPanel {\n  min-height: min(calc(var(--overlay-height) - 23rem), calc(100vh - 2rem));\n  align-items: center;\n  display: flex;\n  justify-content: center;\n}\n"]}

data/app/components/primer/alpha/select_panel.html.erb

@@ -50,7 +50,7 @@
           <% end %>
         <% end %>
       <% end %>
-      <%= render Primer::Alpha::Dialog::Body.new(mt: show_filter? ? 0 : 2, p: 0) do %>
+      <%= render Primer::Alpha::Dialog::Body.new(p: 0) do %>
         <focus-group direction="vertical" mnemonics retain>
           <live-region data-target="select-panel.liveRegion"></live-region>
           <%= render(Primer::BaseComponent.new(
@@ -97,7 +97,7 @@
                 <%= render(@list) %>
               <% end %>
             </div>
-            <div data-target="select-panel.noResults" class="pt-2 color-border-muted text-center d-flex flex-items-start flex-justify-center SelectPanel-emptyPanel" hidden>
+            <div data-target="select-panel.noResults" class="SelectPanel-emptyPanel" hidden>
               <h2 class="v-align-middle m-3 f5"><%= @no_results_label %></h2>
             </div>
           <% end %>

data/app/components/primer/alpha/select_panel.pcss

@@ -1,7 +1,10 @@
 .SelectPanel-loadingPanel {
-  min-height: min(var(--overlay-height) - 10rem, 100vh - 2rem);
+  min-height: min(calc(var(--overlay-height) - 10rem), calc(100vh - 2rem));
 }
 
 .SelectPanel-emptyPanel {
-  min-height: min(var(--overlay-height) - 10rem, 100vh - 2rem);
+  min-height: min(calc(var(--overlay-height) - 23rem), calc(100vh - 2rem));
+  align-items: center;
+  display: flex;
+  justify-content: center;
 }

data/app/lib/primer/current_attributes.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Primer
+  # `Primer::CurrentAttributes` can be used by controllers to set request-bound data
+  # that can be propagated to components.
+  class CurrentAttributes < ActiveSupport::CurrentAttributes
+    attribute :nonce
+  end
+end

data/app/lib/primer/forms/acts_as_component.rb

@@ -8,7 +8,7 @@ module Primer
     module ActsAsComponent
       # :nodoc:
       module InstanceMethods
-        delegate :render, :content_tag, :output_buffer, to: :@view_context
+        delegate :render, :content_tag, :output_buffer, :capture, to: :@view_context
 
         def render_in(view_context, &block)
           @view_context = view_context
@@ -16,17 +16,6 @@ module Primer
           perform_render(&block)
         end
 
-        # This is necessary to restore the functionality changed by https://github.com/rails/rails/pull/47194.
-        # I would love to remove this at some point, perhaps if we ever decide to replace
-        # ActsAsComponent with view component.
-        def capture(*args, &block)
-          old_buffer = @view_context.output_buffer
-          @view_context.output_buffer = ActionView::OutputBuffer.new
-          @view_context.capture(*args, &block)
-        ensure
-          @view_context.output_buffer = old_buffer
-        end
-
         # :nocov:
         def perform_render(&_block)
           raise NotImplementedError, "subclasses must implement ##{__method__}."

data/lib/primer/view_components/version.rb

@@ -5,8 +5,8 @@ module Primer
   module ViewComponents
     module VERSION
       MAJOR = 0
-      MINOR = 42
-      PATCH = 0
+      MINOR = 43
+      PATCH = 1
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end

data/previews/primer/alpha/dialog_preview/with_header_close_button_label.html.erb

@@ -0,0 +1,5 @@
+<%= render(Primer::Alpha::Dialog.new(id: "my-dialog", title: title, subtitle: subtitle, visually_hide_title: false)) do |dialog| %>
+  <% dialog.with_header(show_divider: show_divider, close_label: close_label) %>
+  <% dialog.with_show_button_content(button_text) %>
+  <% dialog.with_body_content("Hello World") %>
+<% end %>

data/previews/primer/alpha/dialog_preview/without_header_close_button_label.html.erb

@@ -0,0 +1,8 @@
+<%= render(Primer::Alpha::Dialog.new(id: "my-dialog", title: title, subtitle: subtitle, visually_hide_title: false)) do |dialog| %>
+  <% dialog.with_header(show_divider: show_divider, close_scheme: :none) %>
+  <% dialog.with_show_button_content(button_text) %>
+  <% dialog.with_body_content("Hello World") %>
+  <% dialog.with_footer do %>
+    <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": "my-dialog" })) { "Close" } %>
+  <% end %>
+<% end %>

data/previews/primer/alpha/dialog_preview.rb

@@ -302,6 +302,38 @@ module Primer
       def with_header_filter
         render_with_template(locals: {})
       end
+
+      # @label With custom label for close button of header
+      #
+      # @param title [String] text
+      # @param subtitle [String] text
+      # @param button_text [String] text
+      # @param show_divider [Boolean] toggle
+      # @param close_label [String] text
+      def with_header_close_button_label(title: "Test Dialog", subtitle: nil, button_text: "Show Dialog", show_divider: true, close_label: "Close me!")
+        render_with_template(locals: {
+          title: title,
+          subtitle: subtitle,
+          button_text: button_text,
+          show_divider: show_divider,
+          close_label: close_label
+        })
+      end
+
+      # @label Without custom label for close button of header
+      #
+      # @param title [String] text
+      # @param subtitle [String] text
+      # @param button_text [String] text
+      # @param show_divider [Boolean] toggle
+      def without_header_close_button_label(title: "Test Dialog", subtitle: nil, button_text: "Show Dialog", show_divider: true)
+        render_with_template(locals: {
+          title: title,
+          subtitle: subtitle,
+          button_text: button_text,
+          show_divider: show_divider
+        })
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: primer_view_components
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.1
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-15 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -551,6 +551,7 @@ files:
 - app/lib/primer/css/layout.css.json
 - app/lib/primer/css/utilities.css
 - app/lib/primer/css/utilities.css.json
+- app/lib/primer/current_attributes.rb
 - app/lib/primer/experimental_render_helpers.rb
 - app/lib/primer/experimental_slot_helpers.rb
 - app/lib/primer/fetch_or_fallback_helper.rb
@@ -782,8 +783,10 @@ files:
 - previews/primer/alpha/dialog_preview/with_footer.html.erb
 - previews/primer/alpha/dialog_preview/with_form.html.erb
 - previews/primer/alpha/dialog_preview/with_header.html.erb
+- previews/primer/alpha/dialog_preview/with_header_close_button_label.html.erb
 - previews/primer/alpha/dialog_preview/with_header_filter.html.erb
 - previews/primer/alpha/dialog_preview/with_text_input.html.erb
+- previews/primer/alpha/dialog_preview/without_header_close_button_label.html.erb
 - previews/primer/alpha/dropdown_preview.rb
 - previews/primer/alpha/form_control_preview.rb
 - previews/primer/alpha/form_control_preview/playground.html.erb