playbook_ui 13.21.0.pre.alpha.PLAY12582531 → 13.21.0.pre.alpha.PLAY12652489

data/app/pb_kits/playbook/pb_list/list.html.erb

@@ -5,8 +5,7 @@
                   data: object.data,
                   id: object.id,
                   role: object.role,
-                  tabindex: object.tabindex,
-                  **combined_html_options
+                  tabindex: object.tabindex
     ) do %>
       <%= content.presence %>
   <% end %>

data/app/pb_kits/playbook/pb_list/list.rb

@@ -41,6 +41,7 @@ module Playbook
         dark ? "dark" : nil
       end
 
+      # rubocop:disable Style/CaseLikeIf
       def layout_class
         if layout == "right"
           "layout_right"
@@ -50,6 +51,7 @@ module Playbook
           ""
         end
       end
+      # rubocop:enable Style/CaseLikeIf
 
       def size_class
         size ? "large" : nil

data/app/pb_kits/playbook/pb_loading_inline/loading_inline.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
 
   <%= pb_rails("body", props: { color: "light", dark: object.dark }) do %>
     <%= pb_rails("icon", props: { aria: { label: "loading icon" }, fixed_width: true, icon: "spinner", pulse: true }) %> Loading

data/app/pb_kits/playbook/pb_message/message.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
     <% if object.valid? %>
       <%= pb_rails("avatar", props: {
         name: object.avatar_name,

data/app/pb_kits/playbook/pb_message/message_mention.html.erb

@@ -2,7 +2,6 @@
   id: object.id,
   data: object.data,
   class: object.classname,
-  aria: object.aria,
-  **combined_html_options) do %>
+  aria: object.aria) do %>
     <%= content %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_multi_level_select/multi_level_select.html.erb

@@ -2,7 +2,6 @@
       aria: object.aria,
       data: object.data,
       id: object.id,
-      class: object.classname,
-      **combined_html_options) do %>
+      class: object.classname) do %>
   <%= react_component("MultiLevelSelect", object.multi_level_select_options)  %>
 <% end %>

data/app/pb_kits/playbook/pb_multiple_users/multiple_users.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria,
     class: object.classname,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
     <% object.users.take(object.display_count).each do |user| %>
       <%= pb_rails("avatar", props: user.merge({size: object.size, classname: "pb_multiple_users_item", dark: object.dark}) ) %>
     <% end %>

data/app/pb_kits/playbook/pb_multiple_users_stacked/multiple_users_stacked.html.erb

@@ -2,8 +2,7 @@
   aria: object.aria,
   class: object.classname,
   data: object.data,
-  id: object.id,
-  **combined_html_options) do %>
+  id: object.id) do %>
   <%= pb_rails("avatar", props: object.users[0].merge({size: "xs", classname: "pb_multiple_users_stacked_item", dark: object.dark}) ) %>
 
   <% unless object.only_one %>

data/app/pb_kits/playbook/pb_nav/item.html.erb

@@ -8,8 +8,7 @@
           dark: object.dark,
           id: object.id,
           href: object.link && object.link,
-          target: object.link && object.target,
-          **combined_html_options
+          target: object.link && object.target    
           ) do %>
           <% if object.image_url %>
             <%= pb_rails("image", props: { url: object.image_url, classname: "pb_nav_img_wrapper_collapsible" }) %>
@@ -30,7 +29,6 @@
     <%= content_tag(object.tag,
       aria: object.aria,
       class: object.classname,
-      **combined_html_options,
       data: object.data,
       dark: object.dark,
       id: object.id,
@@ -50,4 +48,4 @@
         <%= pb_rails("icon", props: { icon: object.icon_right, classname: "pb_nav_list_item_icon_right", fixed_width: true}) %>
       <% end %>
     <% end %>
-  <% end %>
+  <% end %>

data/app/pb_kits/playbook/pb_nav/nav.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria,
     class: object.classname,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
   <% if object.title %>
     <%= content_tag(:div, class: "pb_nav_list_title") do %>
       <%= content_tag(:a, class: "pb_nav_list_item_link_text", href: object.link) do %>

data/app/pb_kits/playbook/pb_online_status/online_status.html.erb

@@ -2,6 +2,5 @@
     aria: object.aria.merge!(label: object.status),
     class: object.classname,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
 <% end %>

data/app/pb_kits/playbook/pb_pagination/pagination.html.erb

@@ -2,7 +2,6 @@
     aria: object.aria,
     class: object.classname,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
      <%= will_paginate object.model, renderer: Playbook::Pagination::Rails %>
 <% end %>

data/app/pb_kits/playbook/pb_passphrase/passphrase.html.erb

@@ -1 +1 @@
-  <%= react_component('Passphrase', object.passphrase_options, class: object.classname, **combined_html_options) %>
+  <%= react_component('Passphrase', object.passphrase_options, class: object.classname,) %>

data/app/pb_kits/playbook/pb_person/person.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
       <%= pb_rails("body", props: {
         tag: "span",
         classname: "pb_person_first" }) { object.first_name } %>

data/app/pb_kits/playbook/pb_person_contact/person_contact.html.erb

@@ -2,8 +2,7 @@
   aria: object.aria,
   id: object.id,
   data: object.data,
-  class: object.classname,
-  **combined_html_options) do %>
+  class: object.classname) do %>
   <%= pb_rails("person", props: {
       first_name: object.first_name,
       last_name: object.last_name,

data/app/pb_kits/playbook/pb_pill/pill.html.erb

@@ -2,7 +2,6 @@
     aria: object.aria,
     class: object.classname,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
   <%= pb_rails("title", props: { text: object.display_text, tag: "div", size: 4, classname: "pb_pill_text" }) %>
 <% end %>

data/app/pb_kits/playbook/pb_popover/popover.html.erb

@@ -2,8 +2,7 @@
   aria: object.aria,
   class: object.classname,
   data: object.data,
-  id: object.id,
-  **combined_html_options) do %>
+  id: object.id) do %>
   <div class="pb_popover_tooltip hide" id="<%= object.tooltip_id %>" role="tooltip" style="<%= object.z_index_helper %>">
     <div class="pb_popover_body <%= object.width_height_class_helper %> <%= object.popover_spacing_helper %>" style="<%= object.width_height_helper %>">
       <%= content.presence %>

data/app/pb_kits/playbook/pb_progress_pills/progress_pills.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria_attributes,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
 
     <div class="progress_pills_status">
       <% object.with_status do |status| %>

data/app/pb_kits/playbook/pb_progress_simple/progress_simple.html.erb

@@ -3,8 +3,7 @@
   id: object.id,
   data: object.data_values,
   class: object.classname,
-  style: object.style,
-  **combined_html_options) do %>
+  style: object.style) do %>
     <%= content_tag(:div, "",
       class: "progress_simple_value",
       style: object.value_style) %>

data/app/pb_kits/playbook/pb_progress_step/progress_step.html.erb

@@ -1,7 +1,6 @@
 <%= content_tag(:ul,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
   <%= content.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_progress_step/progress_step_item.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:li,
   id: object.id,
   data: object.data,
-  class: object.classname,
-  **combined_html_options) do %>
+  class: object.classname) do %>
   <div class="box" style="max-width: min-content;" id="<%= object.tooltip_trigger_class %>">
     <div class="circle">
       <%= pb_rails("icon", props: { icon: object.icon, size: "xs" }) if object.icon.present? %>

data/app/pb_kits/playbook/pb_radio/radio.html.erb

@@ -4,8 +4,7 @@
     class: object.classname,
     data: object.data,
     id: object.id,
-    value: object.value,
-    **combined_html_options) do %>
+    value: object.value) do %>
 
     <% if content.present? %>
       <%= content %>

data/app/pb_kits/playbook/pb_section_separator/section_separator.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
     <% if object.orientation === 'horizontal' %>
         <% if content %>
             <%= content %>

data/app/pb_kits/playbook/pb_select/select.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
   aria: object.aria,
   data: object.data,
-  class: object.classnames,
-  **combined_html_options) do %>
+  class: object.classnames) do %>
   <% if object.label %>
     <label class="pb_select_kit_label" for="<%= object.name %>">
       <%= pb_rails("caption", props: { text: object.label }) %>

data/app/pb_kits/playbook/pb_selectable_card/selectable_card.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
   id: object.id,
   data: object.data,
-  class: object.classname,
-  **combined_html_options) do %>
+  class: object.classname) do %>
 
   <% if object.multi %>
     <%= check_box_tag(object.name, object.value, object.checked, object.additional_input_options) %>

data/app/pb_kits/playbook/pb_selectable_card_icon/selectable_card_icon.html.erb

@@ -1,7 +1,6 @@
 <%= content_tag(:div,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
 
   <%= pb_rails("selectable_card", props: {
     input_id: object.input_id,

data/app/pb_kits/playbook/pb_selectable_icon/selectable_icon.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
 
     <% if object.inputs == "disabled" %>
 

data/app/pb_kits/playbook/pb_selectable_list/selectable_list.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria,
     class: object.classname,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
   <%= pb_rails("list") do %>
     <% object.items.each do |item| %>
       <%= pb_rails("selectable_list/selectable_list_item", props: item.merge(variant: object.variant, id: object.get_id(item)) )%>

data/app/pb_kits/playbook/pb_selectable_list/selectable_list_item.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria,
     class: object.classname,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
   <% if object.variant == "radio"%>
     <%= pb_rails("radio", props: { text: object.text, checked: object.checked, input_options: object.input_options } ) %>
     <% if content.present? %>

data/app/pb_kits/playbook/pb_source/source.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
   <div class="pb__source_layout">
     <% if !object.hide_icon %>
       <% if object.show_icon? %>

data/app/pb_kits/playbook/pb_star_rating/star_rating.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
   id: object.id,
   data: object.data,
-  class: object.classname,
-  **combined_html_options) do %>
+  class: object.classname) do %>
   <% if layout_option == "number" %>
     <% case object.size %>
       <% when "xs", "sm" %>

data/app/pb_kits/playbook/pb_stat_change/stat_change.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
       <%= pb_rails("body", props: { status: object.status }) do %>
         <%= pb_rails("icon", props: { fixed_width: true, icon: object.returned_icon }) if object.returned_icon %>
         <%= "#{object.value}%" if object.value %>

data/app/pb_kits/playbook/pb_stat_value/stat_value.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
   <div class="pb_stat_value_wrapper">
     <%= pb_rails "title", props: {
       classname: "pb_stat_value_kit",

data/app/pb_kits/playbook/pb_table/table.html.erb

@@ -4,8 +4,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence %>
     <% end %>
   <% else %>
@@ -13,8 +12,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence %>
     <% end %>
   <% end %>

data/app/pb_kits/playbook/pb_table/table_body.html.erb

@@ -3,8 +3,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence %>
     <% end %>
 <% else %>
@@ -12,8 +11,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence %>
     <% end %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_table/table_cell.html.erb

@@ -3,8 +3,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence || object.text %>
     <% end %>
 <% else %>
@@ -12,8 +11,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence || object.text %>
     <% end %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_table/table_head.html.erb

@@ -3,8 +3,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence %>
     <% end %>
 <% else %>
@@ -12,8 +11,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence %>
     <% end %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_table/table_header.html.erb

@@ -4,8 +4,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: "pb-th#{object.id}",
-      **combined_html_options) do %>
+      id: "pb-th#{object.id}" ) do %>
     <% unless sorting_style? %>
       <%= pb_rails("flex", props:{ align: object.align_content, justify: object.justify_sort_icon, classname: "pb_th_nolink" }) do %>
         <%= content.presence || object.text %>
@@ -52,8 +51,7 @@
     aria: object.aria,
     class: object.classname,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
       <%= content.presence || object.text %>
   <% end %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_table/table_row.html.erb

@@ -3,8 +3,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence %>
     <% end %>
 <% else %>
@@ -12,8 +11,7 @@
       aria: object.aria,
       class: object.classname,
       data: object.data,
-      id: object.id,
-      **combined_html_options) do %>
+      id: object.id) do %>
       <%= content.presence %>
     <% end %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_text_input/_text_input.scss

@@ -3,6 +3,7 @@
 @import "../tokens/colors";
 
 [class^="pb_text_input_kit"] {
+  margin-bottom: $space_sm;
   .pb_text_input_kit_label {
     margin-bottom: $space_xs;
     display: block;

data/app/pb_kits/playbook/pb_text_input/_text_input.tsx

@@ -60,10 +60,6 @@ const TextInput = (props: TextInputProps, ref: React.LegacyRef<HTMLInputElement>
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
   const htmlProps = buildHtmlProps(htmlOptions)
-  const filteredProps = {...props}
-  if (filteredProps.marginBottom === undefined) {
-     filteredProps.marginBottom = "sm"
-  }
 
   const { alignment, border, icon } = addOn
   const addOnAlignment = alignment === 'left' ? 'left' : 'right'
@@ -78,7 +74,7 @@ const TextInput = (props: TextInputProps, ref: React.LegacyRef<HTMLInputElement>
     'pb_text_input_kit',
     inline ? 'inline' : "",
     error ? 'error' : "",
-    globalProps(filteredProps),
+    globalProps(props),
     className,
   ])
   const addOnIcon = (

data/app/pb_kits/playbook/pb_text_input/text_input.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     aria: object.aria,
     class: object.classname,
-    data: object.data,
-    **combined_html_options) do %>
+    data: object.data) do %>
   <% if object.label.present? %>
     <%= pb_rails("caption", props: { text: object.label, dark: object.dark, classname: "pb_text_input_kit_label" }) %>
   <% end %>

data/app/pb_kits/playbook/pb_text_input/text_input.rb

@@ -26,8 +26,7 @@ module Playbook
                     nested_kit: Playbook::PbTextInput::AddOn
 
       def classname
-        default_margin_bottom = margin_bottom.present? ? "" : " mb_sm"
-        generate_classname("pb_text_input_kit") + default_margin_bottom + error_class + inline_class
+        generate_classname("pb_text_input_kit") + error_class + inline_class
       end
 
       def input_tag

data/app/pb_kits/playbook/pb_text_input/text_input.test.js

@@ -16,7 +16,7 @@ test('returns namespaced class name', () => {
   )
 
   const kit = screen.getByTestId(testId)
-  expect(kit).toHaveClass(`${kitClass} mb_sm`)
+  expect(kit).toHaveClass(kitClass)
 })
 
 test('returns additional class name', () => {

data/app/pb_kits/playbook/pb_textarea/textarea.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
   <% if object.label.present? %>
     <%= pb_rails("caption", props: {text: object.label, dark: object.dark}) %>
   <% end %>

data/app/pb_kits/playbook/pb_time/time.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
   <%
     # convert deprecated prop values
     size = object.size

data/app/pb_kits/playbook/pb_time_range_inline/time_range_inline.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
       <div class="pb_time_range_inline_wrapper">
         <% if object.icon == true %>
           <%= pb_rails(object.text_kit, props: { tag: "span", dark: object.dark, color: object.icon_color, text: pb_rails("icon", props: { icon: "clock", dark: object.dark, classname:"pb_time_range_inline_icon", fixed_width: true, size: object.size }) }) %>
@@ -14,4 +13,4 @@
           <%= pb_rails(object.text_kit, props: { tag: "span", color: object.text_timezone_color, classname:"pb_time_range_inline_timezone", text: object.pb_date_end_time.to_timezone.upcase }) %>
         <% end %>
       </div>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_time_stacked/time_stacked.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
 
     <%= pb_rails("body", props: { color: "light", dark: object.dark, classname: "pb_time_stacked time-spacing" }) do %>
       <time>

data/app/pb_kits/playbook/pb_timeline/item.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
   id: object.id,
   data: object.data,
-  class: object.classname,
-  **combined_html_options) do %>
+  class: object.classname) do %>
 
   <div class="pb_timeline_item_left_block">
     <% if object.date.present? %>

data/app/pb_kits/playbook/pb_timeline/timeline.html.erb

@@ -1,7 +1,6 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
   <%= content.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_timestamp/timestamp.html.erb

@@ -2,8 +2,7 @@
   aria: object.aria,
   id: object.id,
   data: object.data,
-  class: object.classname,
-  **combined_html_options) do %>
+  class: object.classname) do %>
 
   <% if object.unstyled %>
     <div><%= object.timestamp_text %></div>