mirror of
https://github.com/opf/openproject.git
synced 2026-06-13 19:20:00 +00:00
Update CollapsibleHeader usages for API change
Pass in `collapsible_id` in order to properly set `aria-controls` on the CollapsibleHeader's clickable area.
This commit is contained in:
committed by
Henriette Darge
parent
7a05faceed
commit
fb29bbc310
@@ -1,8 +1,8 @@
|
||||
<%= render(Primer::Beta::BorderBox.new) do |component| %>
|
||||
<%= render(Primer::Beta::BorderBox.new(list_id: "border-box-list")) do |component| %>
|
||||
<% component.with_header do %>
|
||||
<%= render(Primer::OpenProject::FlexLayout.new(align_items: :flex_start)) do |flex| %>
|
||||
<%= flex.with_column(flex: 1, pt: 1) do %>
|
||||
<%= render(Primer::OpenProject::BorderBox::CollapsibleHeader.new(box: component)) do |header|
|
||||
<%= render(Primer::OpenProject::BorderBox::CollapsibleHeader.new(collapsible_id: "border-box-list")) do |header|
|
||||
header.with_count(count: 3)
|
||||
header.with_title { "Collapsible title" }
|
||||
header.with_description { "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor" }
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
flex.with_column(flex: 1, pt: 1) do
|
||||
render(
|
||||
Primer::OpenProject::BorderBox::CollapsibleHeader.new(
|
||||
box: @box, collapsed: @collapsed
|
||||
collapsible_id: "#{dom_id(@backlog)}-list",
|
||||
collapsed: @collapsed
|
||||
)
|
||||
) do |header|
|
||||
header.with_title(font_weight: :bold) { @backlog.title }
|
||||
|
||||
@@ -34,12 +34,11 @@ module MeetingSections
|
||||
include OpTurbo::Streamable
|
||||
include OpPrimer::ComponentHelpers
|
||||
|
||||
def initialize(backlog:, collapsed:, current_occurrence:, box: nil)
|
||||
def initialize(backlog:, collapsed:, current_occurrence:)
|
||||
super
|
||||
|
||||
@backlog = backlog
|
||||
@meeting = backlog.meeting
|
||||
@box = box
|
||||
@current_occurrence = current_occurrence
|
||||
|
||||
# When a specific collapsed state is needed, collapsed is passed in as either true or false
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<%=
|
||||
component_wrapper(class: "op-meeting-section-container", data: { test_selector: "meeting-section-container-#{@meeting_section.id}" }.merge(draggable_item_config)) do
|
||||
render(border_box_container(mt: 3, data: drag_and_drop_target_config)) do |component|
|
||||
render(border_box_container(mt: 3, data: drag_and_drop_target_config, list_id: "#{dom_id(@meeting_section)}-list")) do |component|
|
||||
if render_section_wrapper?
|
||||
component.with_header(font_weight: :bold, pl: 0) do
|
||||
render(MeetingSections::HeaderComponent.new(meeting_section: @meeting_section, state: @state))
|
||||
end
|
||||
elsif render_backlog?
|
||||
component.with_header do
|
||||
render(MeetingSections::Backlogs::HeaderComponent.new(backlog: @meeting_section, box: component, collapsed: @collapsed, current_occurrence: @current_occurrence))
|
||||
render(MeetingSections::Backlogs::HeaderComponent.new(backlog: @meeting_section, collapsed: @collapsed, current_occurrence: @current_occurrence))
|
||||
end
|
||||
end
|
||||
if render_new_button_in_section?
|
||||
|
||||
Reference in New Issue
Block a user