openproject-primer_view_components 0.64.0 → 0.64.1

data/app/components/primer/open_project/border_box/collapsible_header.css

@@ -1 +1 @@
-.CollapsibleHeader{align-items:center;cursor:pointer;display:flex}.Box:has(.CollapsibleHeader--collapsed){border-bottom-left-radius:0;border-bottom-right-radius:0;border-bottom-width:var(--borderWidth-thicker)}.Box:has(.CollapsibleHeader--collapsed) .Box-body,.Box:has(.CollapsibleHeader--collapsed) .Box-footer,.Box:has(.CollapsibleHeader--collapsed) .Box-row{display:none}
+.CollapsibleHeader{align-items:center;cursor:pointer;display:flex}.Box:has(.CollapsibleHeader--collapsed){border-bottom-left-radius:0;border-bottom-right-radius:0;border-bottom-width:var(--borderWidth-thicker)}.Box:has(.CollapsibleHeader--collapsed) .Box-body,.Box:has(.CollapsibleHeader--collapsed) .Box-footer,.Box:has(.CollapsibleHeader--collapsed) .Box-row{display:none}.CollapsibleHeader--triggerArea{width:100%}

data/app/components/primer/open_project/border_box/collapsible_header.css.json

@@ -5,6 +5,7 @@
     ".Box:has(.CollapsibleHeader--collapsed)",
     ".Box:has(.CollapsibleHeader--collapsed) .Box-body",
     ".Box:has(.CollapsibleHeader--collapsed) .Box-footer",
-    ".Box:has(.CollapsibleHeader--collapsed) .Box-row"
+    ".Box:has(.CollapsibleHeader--collapsed) .Box-row",
+    ".CollapsibleHeader--triggerArea"
   ]
 }

data/app/components/primer/open_project/border_box/collapsible_header.css.map

@@ -1 +1 @@
-{"version":3,"sources":["collapsible_header.pcss"],"names":[],"mappings":"AAEA,mBAGI,kBAAmB,CAFnB,cAAe,CACf,YAEJ,CAEA,wCACI,2BAA4B,CAC5B,4BAA6B,CAC7B,8CAOJ,CALI,uJAGI,YACJ","file":"collapsible_header.css","sourcesContent":["/* CSS for BorderBox::CollapsibleHeader  */\n\n.CollapsibleHeader {\n    cursor: pointer;\n    display: flex;\n    align-items: center;\n}\n\n.Box:has(.CollapsibleHeader--collapsed) {\n    border-bottom-left-radius: 0;\n    border-bottom-right-radius: 0;\n    border-bottom-width: var(--borderWidth-thicker);\n\n    & .Box-row,\n    & .Box-body,\n    & .Box-footer {\n        display: none;\n    }\n}\n"]}
+{"version":3,"sources":["collapsible_header.pcss"],"names":[],"mappings":"AAEA,mBAGI,kBAAmB,CAFnB,cAAe,CACf,YAEJ,CAEA,wCACI,2BAA4B,CAC5B,4BAA6B,CAC7B,8CAOJ,CALI,uJAGI,YACJ,CAGJ,gCACI,UACJ","file":"collapsible_header.css","sourcesContent":["/* CSS for BorderBox::CollapsibleHeader  */\n\n.CollapsibleHeader {\n    cursor: pointer;\n    display: flex;\n    align-items: center;\n}\n\n.Box:has(.CollapsibleHeader--collapsed) {\n    border-bottom-left-radius: 0;\n    border-bottom-right-radius: 0;\n    border-bottom-width: var(--borderWidth-thicker);\n\n    & .Box-row,\n    & .Box-body,\n    & .Box-footer {\n        display: none;\n    }\n}\n\n.CollapsibleHeader--triggerArea {\n    width: 100%;\n}\n"]}

data/app/components/primer/open_project/border_box/collapsible_header.html.erb

@@ -1,5 +1,16 @@
 <%= render(Primer::BaseComponent.new(**@system_arguments)) do %>
-  <%= render(Primer::OpenProject::FlexLayout.new) do |flex| %>
+  <%= render(Primer::OpenProject::FlexLayout.new(
+    data: {
+      target: "collapsible-header.triggerElement",
+      action: "click:collapsible-header#toggle keydown:collapsible-header#toggleViaKeyboard"
+    },
+    tabindex: 0,
+    role: "button",
+    aria: {
+      expanded: !@collapsed,
+    },
+    classes: "CollapsibleHeader--triggerArea"
+  )) do |flex| %>
     <%= flex.with_row do %>
       <%= title %>
       <% if count? %>

data/app/components/primer/open_project/border_box/collapsible_header.pcss

@@ -17,3 +17,7 @@
         display: none;
     }
 }
+
+.CollapsibleHeader--triggerArea {
+    width: 100%;
+}

data/app/components/primer/open_project/border_box/collapsible_header.rb

@@ -32,39 +32,43 @@ module Primer
         # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
         renders_one :description, lambda { |**system_arguments, &block|
           system_arguments[:color] ||= :subtle
+          system_arguments[:hidden] = @collapsed
+
           system_arguments[:data] = merge_data(
             system_arguments, {
-            data: {
+              data: {
                 targets: "collapsible-header.collapsibleElements"
               }
             }
           )
-          system_arguments[:hidden] = @collapsed
 
           Primer::Beta::Text.new(**system_arguments, &block)
         }
 
-
+        # @param id [String] The unique ID of the collapsible header.
         # @param collapsed [Boolean] Whether the header is collapsed on initial render.
         # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-        def initialize(collapsed: false, box:, **system_arguments)
+        def initialize(id: self.class.generate_id, collapsed: false, box:, **system_arguments)
           @collapsed = collapsed
           @box = box
           @system_arguments = system_arguments
-
+          @system_arguments[:id] = id
           @system_arguments[:tag] = "collapsible-header"
           @system_arguments[:classes] = class_names(
             system_arguments[:classes],
             "CollapsibleHeader",
             "CollapsibleHeader--collapsed" => @collapsed
           )
-          @system_arguments[:data] = merge_data(
-            @system_arguments, {
-            data: {
-              action: "click:collapsible-header#toggle"
-            } }
-          )
-          @system_arguments[:data][:collapsed] = true if @collapsed
+          if @collapsed
+            @system_arguments[:data] = merge_data(
+              @system_arguments, {
+                data: {
+                  collapsed: @collapsed
+                }
+              }
+            )
+          end
+
         end
 
         private

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

@@ -1,8 +1,10 @@
 export declare abstract class CollapsibleElement extends HTMLElement {
     arrowDown: Element;
     arrowUp: Element;
+    triggerElement: HTMLElement;
     collapsibleElements: HTMLElement[];
     collapsed: boolean;
+    toggleViaKeyboard(event: KeyboardEvent): void;
     toggle(): void;
     attributeChangedCallback(name: string): void;
     hideAll(): void;

data/app/components/primer/open_project/collapsible.js

@@ -11,6 +11,12 @@ export class CollapsibleElement extends HTMLElement {
         super(...arguments);
         this.collapsed = false;
     }
+    toggleViaKeyboard(event) {
+        if (event.code === 'Enter' || event.code === 'Space') {
+            event.preventDefault();
+            this.toggle();
+        }
+    }
     toggle() {
         this.collapsed = !this.collapsed;
     }
@@ -28,6 +34,7 @@ export class CollapsibleElement extends HTMLElement {
         // For whatever reason, setting `hidden` directly does not work on the SVGs
         this.arrowDown?.removeAttribute('hidden');
         this.arrowUp?.setAttribute('hidden', '');
+        this.triggerElement.setAttribute('aria-expanded', 'false');
         for (const el of this.collapsibleElements) {
             el.hidden = true;
         }
@@ -36,6 +43,7 @@ export class CollapsibleElement extends HTMLElement {
     expandAll() {
         this.arrowUp?.removeAttribute('hidden');
         this.arrowDown?.setAttribute('hidden', '');
+        this.triggerElement.setAttribute('aria-expanded', 'true');
         for (const el of this.collapsibleElements) {
             el.hidden = false;
         }
@@ -48,6 +56,9 @@ __decorate([
 __decorate([
     target
 ], CollapsibleElement.prototype, "arrowUp", void 0);
+__decorate([
+    target
+], CollapsibleElement.prototype, "triggerElement", void 0);
 __decorate([
     targets
 ], CollapsibleElement.prototype, "collapsibleElements", void 0);

data/app/components/primer/open_project/collapsible.ts

@@ -4,10 +4,18 @@ import {attr, target, targets} from '@github/catalyst'
 export abstract class CollapsibleElement extends HTMLElement {
   @target arrowDown: Element
   @target arrowUp: Element
+  @target triggerElement: HTMLElement
   @targets collapsibleElements: HTMLElement[]
 
   @attr collapsed = false
 
+  toggleViaKeyboard(event: KeyboardEvent) {
+    if (event.code === 'Enter' || event.code === 'Space') {
+      event.preventDefault()
+      this.toggle()
+    }
+  }
+
   toggle() {
     this.collapsed = !this.collapsed
   }
@@ -26,6 +34,7 @@ export abstract class CollapsibleElement extends HTMLElement {
     // For whatever reason, setting `hidden` directly does not work on the SVGs
     this.arrowDown?.removeAttribute('hidden')
     this.arrowUp?.setAttribute('hidden', '')
+    this.triggerElement.setAttribute('aria-expanded', 'false')
 
     for (const el of this.collapsibleElements) {
       el.hidden = true
@@ -37,6 +46,7 @@ export abstract class CollapsibleElement extends HTMLElement {
   expandAll() {
     this.arrowUp?.removeAttribute('hidden')
     this.arrowDown?.setAttribute('hidden', '')
+    this.triggerElement.setAttribute('aria-expanded', 'true')
 
     for (const el of this.collapsibleElements) {
       el.hidden = false

data/app/components/primer/open_project/collapsible_section.html.erb

@@ -1,7 +1,14 @@
 <%= render(Primer::BaseComponent.new(**@system_arguments)) do %>
   <%= render(Primer::OpenProject::FlexLayout.new) do |flex| %>
     <%= flex.with_row(classes: "CollapsibleSection--triggerArea",
-                      data: { action: "click:collapsible-section#toggle" }) do %>
+                      id: @title_id,
+                      tabindex: 0,
+                      role: "button",
+                      data: {
+                        action: "click:collapsible-section#toggle keydown:collapsible-section#toggleViaKeyboard",
+                        target: "collapsible-section.triggerElement"
+                      },
+                      aria: { expanded: !@collapsed, controls: @content_id }) do %>
       <%= render(Primer::OpenProject::FlexLayout.new(display: :flex, align_items: :center)) do |header| %>
         <%= header.with_column do %>
           <%= title %>
@@ -18,7 +25,12 @@
         <% end %>
       <% end %>
     <% end %>
-    <%= flex.with_row(hidden: @collapsed, mt: 3, data: { targets: "collapsible-section.collapsibleElements" }) do %>
+    <%= flex.with_row(hidden: @collapsed,
+                      mt: 3,
+                      role: "region",
+                      id: @content_id,
+                      data: { targets: "collapsible-section.collapsibleElements" },
+                      aria: { labelledby: @title_id }) do %>
       <%= collapsible_content %>
     <% end %>
   <% end %>

data/app/components/primer/open_project/collapsible_section.rb

@@ -47,13 +47,17 @@ module Primer
         Primer::BaseComponent.new(tag: :div, **system_arguments)
       }
 
+      # @param id [String] The unique ID of the collapsible section.
       # @param collapsed [Boolean] Whether the section is collapsed on initial render.
       # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
-      def initialize(collapsed: false, **system_arguments)
+      def initialize(id: self.class.generate_id, collapsed: false, **system_arguments)
+        @title_id = "#{id}-title"
+        @content_id = "#{id}-content"
         @collapsed = collapsed
 
         @system_arguments = deny_tag_argument(**system_arguments)
         @system_arguments[:tag] = "collapsible-section"
+        @system_arguments[:id] = id
         @system_arguments[:classes] = class_names(
           @system_arguments[:classes],
           "CollapsibleSection",

data/app/components/primer/open_project/danger_dialog.html.erb

@@ -1,4 +1,8 @@
 <%= render @dialog do |dialog| %>
+  <% unless header.present? %>
+    <% dialog.with_header(close_label: I18n.t("button_close")) %>
+  <% end %>
+
   <danger-dialog-form-helper>
     <%= render(@form_wrapper) do %>
       <scrollable-region data-labelled-by="<%= labelledby %>">

data/app/components/primer/open_project/feedback_dialog.html.erb

@@ -1,10 +1,15 @@
 <%= render @dialog do |dialog| %>
+  <% unless header.present? %>
+    <% dialog.with_header(close_label: I18n.t("button_close")) %>
+  <% end %>
+
   <% dialog.with_body do %>
     <%= feedback_message %>
     <% if additional_details.present? %>
       <%= additional_details %>
     <% end %>
   <% end %>
+
   <% dialog.with_footer do %>
     <% if footer.present? %>
       <%= footer %>

data/lib/primer/view_components/version.rb

@@ -6,7 +6,7 @@ module Primer
     module VERSION
       MAJOR = 0
       MINOR = 64
-      PATCH = 0
+      PATCH = 1
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end

data/static/arguments.json

@@ -5174,6 +5174,12 @@
     "source": "https://github.com/primer/view_components/tree/main/app/components/primer/open_project/border_box/collapsible_header.rb",
     "lookbook": "https://primer.style/view-components/lookbook/inspect/primer/open_project/border_box/collapsible_header/default/",
     "parameters": [
+      {
+        "name": "id",
+        "type": "String",
+        "default": "`self.class.generate_id`",
+        "description": "The unique ID of the collapsible header."
+      },
       {
         "name": "collapsed",
         "type": "Boolean",
@@ -5234,6 +5240,12 @@
     "source": "https://github.com/primer/view_components/tree/main/app/components/primer/open_project/collapsible_section.rb",
     "lookbook": "https://primer.style/view-components/lookbook/inspect/primer/open_project/collapsible_section/default/",
     "parameters": [
+      {
+        "name": "id",
+        "type": "String",
+        "default": "`self.class.generate_id`",
+        "description": "The unique ID of the collapsible section."
+      },
       {
         "name": "collapsed",
         "type": "Boolean",

data/static/classes.json

@@ -243,6 +243,9 @@
   "CollapsibleHeader": [
     "Primer::OpenProject::BorderBox::CollapsibleHeader"
   ],
+  "CollapsibleHeader--triggerArea": [
+    "Primer::OpenProject::BorderBox::CollapsibleHeader"
+  ],
   "CollapsibleSection--triggerArea": [
     "Primer::OpenProject::CollapsibleSection"
   ],

data/static/info_arch.json

@@ -17690,6 +17690,12 @@
     "source": "https://github.com/primer/view_components/tree/main/app/components/primer/open_project/border_box/collapsible_header.rb",
     "lookbook": "https://primer.style/view-components/lookbook/inspect/primer/open_project/border_box/collapsible_header/default/",
     "parameters": [
+      {
+        "name": "id",
+        "type": "String",
+        "default": "`self.class.generate_id`",
+        "description": "The unique ID of the collapsible header."
+      },
       {
         "name": "collapsed",
         "type": "Boolean",
@@ -17952,6 +17958,12 @@
     "source": "https://github.com/primer/view_components/tree/main/app/components/primer/open_project/collapsible_section.rb",
     "lookbook": "https://primer.style/view-components/lookbook/inspect/primer/open_project/collapsible_section/default/",
     "parameters": [
+      {
+        "name": "id",
+        "type": "String",
+        "default": "`self.class.generate_id`",
+        "description": "The unique ID of the collapsible section."
+      },
       {
         "name": "collapsed",
         "type": "Boolean",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openproject-primer_view_components
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.64.1
 platform: ruby
 authors:
 - GitHub Open Source
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview