From 0c76690f08fa011c9d5d4fcf01a2040024791044 Mon Sep 17 00:00:00 2001 From: Yuriy Ivanenko Date: Thu, 30 Jan 2025 14:31:15 -0500 Subject: [PATCH 1/4] Update layout to pb_content_tag --- playbook/app/pb_kits/playbook/pb_layout/body.html.erb | 6 +----- playbook/app/pb_kits/playbook/pb_layout/footer.html.erb | 6 +----- playbook/app/pb_kits/playbook/pb_layout/header.html.erb | 6 +----- playbook/app/pb_kits/playbook/pb_layout/item.html.erb | 6 +----- playbook/app/pb_kits/playbook/pb_layout/layout.html.erb | 6 +----- playbook/app/pb_kits/playbook/pb_layout/sidebar.html.erb | 6 +----- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/playbook/app/pb_kits/playbook/pb_layout/body.html.erb b/playbook/app/pb_kits/playbook/pb_layout/body.html.erb index ccf14c7503..919544cc91 100755 --- a/playbook/app/pb_kits/playbook/pb_layout/body.html.erb +++ b/playbook/app/pb_kits/playbook/pb_layout/body.html.erb @@ -1,7 +1,3 @@ -<%= content_tag(object.tag, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options) do %> +<%= pb_content_tag do %> <%= content.presence %> <% end %> diff --git a/playbook/app/pb_kits/playbook/pb_layout/footer.html.erb b/playbook/app/pb_kits/playbook/pb_layout/footer.html.erb index ccf14c7503..919544cc91 100755 --- a/playbook/app/pb_kits/playbook/pb_layout/footer.html.erb +++ b/playbook/app/pb_kits/playbook/pb_layout/footer.html.erb @@ -1,7 +1,3 @@ -<%= content_tag(object.tag, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options) do %> +<%= pb_content_tag do %> <%= content.presence %> <% end %> diff --git a/playbook/app/pb_kits/playbook/pb_layout/header.html.erb b/playbook/app/pb_kits/playbook/pb_layout/header.html.erb index ccf14c7503..919544cc91 100755 --- a/playbook/app/pb_kits/playbook/pb_layout/header.html.erb +++ b/playbook/app/pb_kits/playbook/pb_layout/header.html.erb @@ -1,7 +1,3 @@ -<%= content_tag(object.tag, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options) do %> +<%= pb_content_tag do %> <%= content.presence %> <% end %> diff --git a/playbook/app/pb_kits/playbook/pb_layout/item.html.erb b/playbook/app/pb_kits/playbook/pb_layout/item.html.erb index 79c2dddeae..9c6d5aaf8a 100644 --- a/playbook/app/pb_kits/playbook/pb_layout/item.html.erb +++ b/playbook/app/pb_kits/playbook/pb_layout/item.html.erb @@ -1,7 +1,3 @@ -<%= content_tag(:div, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options) do %> +<%= pb_content_tag do %> <%= content %> <% end %> diff --git a/playbook/app/pb_kits/playbook/pb_layout/layout.html.erb b/playbook/app/pb_kits/playbook/pb_layout/layout.html.erb index 2109d1083e..919544cc91 100755 --- a/playbook/app/pb_kits/playbook/pb_layout/layout.html.erb +++ b/playbook/app/pb_kits/playbook/pb_layout/layout.html.erb @@ -1,7 +1,3 @@ -<%= content_tag(:div, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options) do %> +<%= pb_content_tag do %> <%= content.presence %> <% end %> diff --git a/playbook/app/pb_kits/playbook/pb_layout/sidebar.html.erb b/playbook/app/pb_kits/playbook/pb_layout/sidebar.html.erb index 2109d1083e..919544cc91 100755 --- a/playbook/app/pb_kits/playbook/pb_layout/sidebar.html.erb +++ b/playbook/app/pb_kits/playbook/pb_layout/sidebar.html.erb @@ -1,7 +1,3 @@ -<%= content_tag(:div, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options) do %> +<%= pb_content_tag do %> <%= content.presence %> <% end %> From 92479d700e57ae1731143c3040d25c0132326215 Mon Sep 17 00:00:00 2001 From: Yuriy Ivanenko Date: Thu, 30 Jan 2025 14:35:30 -0500 Subject: [PATCH 2/4] Update legend to pb_content_tag --- playbook/app/pb_kits/playbook/pb_legend/legend.html.erb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/playbook/app/pb_kits/playbook/pb_legend/legend.html.erb b/playbook/app/pb_kits/playbook/pb_legend/legend.html.erb index 60253ec617..49935f54c7 100644 --- a/playbook/app/pb_kits/playbook/pb_legend/legend.html.erb +++ b/playbook/app/pb_kits/playbook/pb_legend/legend.html.erb @@ -1,9 +1,4 @@ -<%= content_tag(:div, object.text, - aria: object.aria, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options) do %> +<%= pb_content_tag do %> <%= pb_rails("body", props: {color: object.body_color}) do %> > <%= pb_rails("title", props: { dark: object.dark, text: object.prefix_text, tag: "span", size: 4 }) %> From 9fa63a28478547c57c1c9881cc16cfe7bb9946c8 Mon Sep 17 00:00:00 2001 From: Yuriy Ivanenko Date: Thu, 30 Jan 2025 14:39:02 -0500 Subject: [PATCH 3/4] Update message to pb_content_tag --- playbook/app/pb_kits/playbook/pb_message/message.html.erb | 7 +------ .../pb_kits/playbook/pb_message/message_mention.html.erb | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/playbook/app/pb_kits/playbook/pb_message/message.html.erb b/playbook/app/pb_kits/playbook/pb_message/message.html.erb index e53f837257..2a9a45acdc 100644 --- a/playbook/app/pb_kits/playbook/pb_message/message.html.erb +++ b/playbook/app/pb_kits/playbook/pb_message/message.html.erb @@ -1,9 +1,4 @@ -<%= content_tag(:div, - aria: object.aria, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options) do %> +<%= pb_content_tag do %> <% if object.valid? %> <%= pb_rails("avatar", props: { name: object.avatar_name, diff --git a/playbook/app/pb_kits/playbook/pb_message/message_mention.html.erb b/playbook/app/pb_kits/playbook/pb_message/message_mention.html.erb index 5faca01991..c5a0400f2e 100644 --- a/playbook/app/pb_kits/playbook/pb_message/message_mention.html.erb +++ b/playbook/app/pb_kits/playbook/pb_message/message_mention.html.erb @@ -1,8 +1,3 @@ -<%= content_tag(:div, - id: object.id, - data: object.data, - class: object.classname, - aria: object.aria, - **combined_html_options) do %> +<%= pb_content_tag do %> <%= content %> <% end %> From 3f4117a697e1b24b2de1762e6a25af205cbef52e Mon Sep 17 00:00:00 2001 From: Yuriy Ivanenko Date: Thu, 30 Jan 2025 16:34:42 -0500 Subject: [PATCH 4/4] Update icon to pb_content_tag --- playbook/app/pb_kits/playbook/pb_icon/icon.html.erb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/playbook/app/pb_kits/playbook/pb_icon/icon.html.erb b/playbook/app/pb_kits/playbook/pb_icon/icon.html.erb index d171ed8fd8..950bcc330b 100644 --- a/playbook/app/pb_kits/playbook/pb_icon/icon.html.erb +++ b/playbook/app/pb_kits/playbook/pb_icon/icon.html.erb @@ -5,12 +5,8 @@ <%= object.icon.html_safe %> <% else %> - <%= content_tag(:i, nil, - id: object.id, - data: object.data, - class: object.classname, - **combined_html_options - ) %> + <%= pb_content_tag(:i) do %> + <% end %> <%= content_tag(:span, nil, aria: { label: "#{object.icon} icon" }.merge(object.aria), hidden: true