playbook_ui 13.20.0.pre.alpha.play1247htmloptions2404 → 13.21.0.pre.alpha.PBNTR238DatePickerYearBug2436

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e02e5f3489c1023e0b6ad3090f1970ec8e1c36691376a085c6f76d75b8ce8fa6
-  data.tar.gz: d94386b85c53885fd714d25b360fbe654eafae1e39af8f3be133b2516238a616
+  metadata.gz: 64209521bc01d3e3be0715469da3931209bd44248b18e1b2f8542178b8d8a287
+  data.tar.gz: 8569ab9ef9c9289916420cf624498cbfb2f67393cdf7c1e13e3ce2c3ae336971
 SHA512:
-  metadata.gz: b0bfc0c59486a1a564f48db1a05bae3979c9e3b2262b39ccbfc45043c618192af84658355555ac64a06ece1ffe9caed19227d619b7f15ff51bf5d279a021dc77
-  data.tar.gz: 54a237fe6b13077b388c408009a1b34552d6d35e90bfaece2ea53481bd96f84e3e1fa66db6e170cab2c10a74f49db22ec47114c938b89df84fcbcfb08dc910d9
+  metadata.gz: 7d589eda1384515b9129449ac2fc4d80a1ab6b0aa7903691e390625b8550311d3054d25162243e4c27b2648405e8b65cef3de4c985269f1d5cbbc271ee5d7f6c
+  data.tar.gz: 9faf35f279dc87d08854a9622038a41446b70ac56fa382082a52dfb5fc43c58bf624e14cb04e5d8df7074c8eaec250b21a1fad44965948728221c5b54313fbe1

data/app/pb_kits/playbook/pb_avatar/avatar.html.erb

@@ -2,8 +2,7 @@
     id: object.id,
     data: object.data.merge(initials: object.initials),
     class: object.classname,
-    aria: object.aria,
-    **combined_html_options) do %>
+    aria: object.aria) do %>
   <%= content_tag(:div, data: { initials: object.initials }, class: "avatar_wrapper") do %>
     <%= pb_rails("image", props: { alt: object.alt_text, url: object.image_url, on_error: object.handle_img_error }) if object.image_url.present? %>
   <% end %>

data/app/pb_kits/playbook/pb_avatar_action_button/avatar_action_button.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.tooltip_text.present? %>
         <%= pb_rails("tooltip", props: {
           trigger_element_id: object.tooltip_id,

data/app/pb_kits/playbook/pb_background/background.html.erb

@@ -7,8 +7,7 @@
       style: "background-image: url('#{object.image_url}');
               background-repeat: #{object.background_repeat};
               background-size: #{object.background_size};
-              background-position: #{object.background_position};",
-      **combined_html_options
+              background-position: #{object.background_position};"
   ) do %>
     <%= content.presence %>
   <% end %>

data/app/pb_kits/playbook/pb_badge/badge.html.erb

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

data/app/pb_kits/playbook/pb_body/body.html.erb

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

data/app/pb_kits/playbook/pb_bread_crumbs/bread_crumb_item.html.erb

@@ -2,8 +2,7 @@
     id: object.id,
     data: object.data,
     class: object.classname,
-    aria: object.aria,
-    **combined_html_options) do%>
+    aria: object.aria) do%>
 <%= content_tag(object.link ? 'a' : 'span', class: 'bread_crumb_item', href: object.link) do %>
     <%= content.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_bread_crumbs/bread_crumbs.html.erb

@@ -2,7 +2,6 @@
     aria: object.aria,
     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_button/button.html.erb

@@ -1,6 +1,5 @@
 <%= content_tag(object.tag,
-                object.tag == "button" ? object.options : object.link_options,
-                **combined_html_options) do %>
+    object.tag == "button" ? object.options : object.link_options) do %>
     <% if object.variant === "reaction" %>
         <% if icon && object.valid_emoji(object.icon) %>
             <%= pb_rails("flex", props:{ align: "center" }) do %>

data/app/pb_kits/playbook/pb_button/button.rb

@@ -34,8 +34,10 @@ module Playbook
                               default: "far"
 
       def options
-        options = {
+        {
+          aria: aria,
           class: classname,
+          data: data,
           disabled: disabled,
           id: id,
           role: "button",
@@ -44,7 +46,6 @@ module Playbook
           value: value,
           form: form,
         }.compact
-        combined_html_options.merge!(options) if combined_html_options.present?
       end
 
       def target_attribute

data/app/pb_kits/playbook/pb_button_toolbar/button_toolbar.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 %>
       <%= content.presence || object.text %>
 <% end %>

data/app/pb_kits/playbook/pb_caption/caption.html.erb

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

data/app/pb_kits/playbook/pb_card/card.html.erb

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

data/app/pb_kits/playbook/pb_card/card_body.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.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_card/card_header.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.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_checkbox/checkbox.html.erb

@@ -1,9 +1,7 @@
 <%= content_tag(:label, aria: object.aria,
                         id: object.id,
                         data: object.data,
-                        class: object.classname,
-                        **combined_html_options
-                ) do %>
+                        class: object.classname) do %>
   <%= content.presence || object.input %>
   <% if object.indeterminate %>
     <span class="pb_checkbox_indeterminate">

data/app/pb_kits/playbook/pb_circle_icon_button/circle_icon_button.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("button", props: {type: object.type, link: object.link, new_window:object.new_window, variant: object.variant, disabled: object.disabled, dark: object.dark}) do %>
     <%= pb_rails("icon", props: {icon: object.icon, fixed_width: true, dark: object.dark}) %>
   <% end %>

data/app/pb_kits/playbook/pb_collapsible/collapsible.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 %>
   <%= content.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_collapsible/collapsible_content.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.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_collapsible/collapsible_main.html.erb

@@ -2,8 +2,7 @@
     id: object.id,
     data: object.data,
     class: object.classname,
-    aria: object.aria,
-    **combined_html_options) do %>
+    aria: object.aria) do %>
 
     <%= pb_rails("flex", props: {vertical: "center", spacing: "between", cursor: "pointer"}) do %>
       <%= pb_rails("flex/flex_item") do %>

data/app/pb_kits/playbook/pb_contact/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("body", props: { 
         tag: "span", 
         classname: "pb_contact_kit", 

data/app/pb_kits/playbook/pb_currency/currency.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("caption", props: object.caption_props) %>
 
   <div class=<%= "pb_currency_wrapper#{object.variant_class || object.emphasized_class}" %>>

data/app/pb_kits/playbook/pb_dashboard_value/dashboard_value.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.stat_label.present? %>
     <%= pb_rails("body", props: { color: "light", text: object.stat_label } ) %>
   <% end %>

data/app/pb_kits/playbook/pb_date/date.html.erb

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

data/app/pb_kits/playbook/pb_date_picker/date_picker.html.erb

@@ -2,8 +2,7 @@
     aria: object.aria,
     class: object.classname + object.error_class,
     data: object.data,
-    id: object.id,
-    **combined_html_options) do %>
+    id: object.id) do %>
   <div class="input_wrapper">
     <% if content.present? %>
       <%= content %>
@@ -81,4 +80,4 @@
       }
     })
   <% end %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_date_picker/date_picker_helper.ts

@@ -1,4 +1,5 @@
 import flatpickr from 'flatpickr'
+import { Instance } from "flatpickr/dist/types/instance"
 import { BaseOptions } from 'flatpickr/dist/types/options'
 import monthSelectPlugin from 'flatpickr/dist/plugins/monthSelect'
 import weekSelect from "flatpickr/dist/plugins/weekSelect/weekSelect"
@@ -165,9 +166,9 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
   }
 
   // two way binding
-  const initialDropdown = document.querySelector<HTMLElement & { [x: string]: any }>(`#year-${pickerId}`)
-  const yearChangeHook = () => {
-    initialDropdown.value = initialPicker.currentYear
+  const yearChangeHook = (fp: Instance) => {
+      const yearInput = document.querySelector(`#year-${fp.input.id}`) as HTMLInputElement
+      yearInput.value = fp.currentYear?.toString()
   }
 
   // ===========================================================
@@ -199,11 +200,12 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
       if (!staticPosition && scrollContainer) detachFromScroll(scrollContainer as HTMLElement)
       onClose(selectedDates, dateStr)
     }],
-    onChange: [(selectedDates, dateStr) => {
+    onChange: [(selectedDates, dateStr, fp) => {
+      yearChangeHook(fp)
       onChange(dateStr, selectedDates)
     }],
-    onYearChange: [() => {
-      yearChangeHook()
+    onYearChange: [(_selectedDates, _dateStr, fp) => {
+      yearChangeHook(fp)
     }],
     plugins: setPlugins(thisRangesEndToday, customQuickPickDates),
     position,
@@ -248,7 +250,7 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
         /* Reset date picker to default value on form.reset() */
         if (defaultDate){
           picker.setDate(defaultDate)
-          yearChangeHook()
+          yearChangeHook(picker)
         }
       }, 0)
     })

data/app/pb_kits/playbook/pb_date_range_inline/date_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_date_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: "calendar-alt", fixed_width: true, size: object.size, classname: "pb_date_range_inline_icon" }) }) %>

data/app/pb_kits/playbook/pb_date_range_stacked/date_range_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("flex", props: {vertical: "center"}) do %>
       <%= pb_rails("flex/flex_item") do %>

data/app/pb_kits/playbook/pb_date_stacked/date_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 %>
 
     <% if object.bold == false %>
 

data/app/pb_kits/playbook/pb_date_time/date_time.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("flex", props: {
       orientation: "row",

data/app/pb_kits/playbook/pb_date_time_stacked/date_time_stacked.html.erb

@@ -2,8 +2,7 @@
     id: object.id,
     data: object.data,
     class: object.classname,
-    aria: object.aria,
-    **combined_html_options) do %>
+    aria: object.aria) do %>
 
   <%= pb_rails("flex", props: {classname: "flex-container", vertical: "stretch"}) do %>
       <%= pb_rails("body", props: {classname: "flex-item"}) do %>
@@ -15,4 +14,4 @@
       <% end %>
   <% end %>
 
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_date_year_stacked/date_year_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("title", props: { text: object.day_month, size: 4, dark: object.dark }) %>
   <%= pb_rails("body", props: { text: object.year, size: 4, color: "light", dark: object.dark }) %>
 <% end %>

data/app/pb_kits/playbook/pb_detail/detail.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 %>
   <%= object.content %>
 <% end %>

data/app/pb_kits/playbook/pb_dialog/dialog.html.erb

@@ -3,8 +3,7 @@
         aria: object.aria,
         data: object.data,
         id: object.id,
-        class: object.classname,
-        **combined_html_options) do %>
+        class: object.classname) do %>
             <% if object.status === "" && object.title %>
                 <%= pb_rails("dialog/dialog_header", props: { title: object.title, id: object.id }) %>
             <% end %>

data/app/pb_kits/playbook/pb_dialog/dialog_body.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.presence || object.text %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_dialog/dialog_footer.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    aria: object.aria,
-    **combined_html_options) do %>
+    aria: object.aria) do %>
     <% if object.confirm_button && object.cancel_button %>
         <div class="dialog-pseudo-footer"></div>
         <%= pb_rails("flex", props: { classname:object.classname, spacing:"between", padding_x:"sm", padding:"sm", padding_bottom:"sm" }) do %>

data/app/pb_kits/playbook/pb_dialog/dialog_header.html.erb

@@ -2,8 +2,7 @@
     id: object.id,
     data: object.data,
     class: object.sticky_header,
-    aria: object.aria,
-    **combined_html_options) do %>
+    aria: object.aria) do %>
         <%= pb_rails("flex", props: {classname:object.classname, spacing:"between", padding:"sm", align:"center"}) do %>
             <%= content.presence || object.title %>
             
@@ -12,4 +11,4 @@
             </button>
         <% end %>
         <%= pb_rails("section_separator") %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_file_upload/file_upload.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("form_group", props: {cursor: "pointer", full_width: object.full_width}) do %>
         <label for="upload-<%= object.id %>" class="pb_button_kit_secondary_inline_enabled"><%= "#{object.label}" %></label>
         <%= pb_rails("text_input", props: {

data/app/pb_kits/playbook/pb_filter/filter.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 %>
     <%= object.wrapper do %>
       <%= pb_rails("flex", props: { orientation: "row", padding_right: "lg", vertical: "center" }) do %>
         <% if (object.template != "sort_only") %>

data/app/pb_kits/playbook/pb_fixed_confirmation_toast/fixed_confirmation_toast.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("icon", props: { icon: object.icon_value, classname: "pb_icon", fixed_width: true }) %>
 
     <% if content %>

data/app/pb_kits/playbook/pb_flex/flex.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_flex/flex_item.html.erb

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

data/app/pb_kits/playbook/pb_form_group/form_group.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 %>
   <%= content.presence %>
 <% end %>

data/app/pb_kits/playbook/pb_form_pill/form_pill.html.erb

@@ -1,4 +1,4 @@
-<%= content_tag(:div, id: object.id, data: object.data, class: object.classname + object.size_class, **combined_html_options) do %>
+<%= content_tag(:div, id: object.id, data: object.data, class: object.classname + object.size_class) do %>
   <% if object.name.present? %>
     <%= pb_rails("avatar", props: { name: object.name, image_url: object.avatar_url, size: "xs" }) %>
       <%= pb_rails("title", props: { text: object.name, size: 4, classname: "pb_form_pill_text" }) %>
@@ -9,4 +9,4 @@
               <%= pb_rails("body", props: { classname: "pb_form_pill_close" }) do %>
                 <%= pb_rails("icon", props: { icon: 'times' , fixed_width: true }) %>
                   <% end %>
-                    <% end %>
+                    <% end %>

data/app/pb_kits/playbook/pb_hashtag/hashtag.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 %>
   <%= link_to object.url, target: object.link_option do %>
     <%= pb_rails("badge", props: { dark: object.dark, variant: "primary", text: object.hashtag_text }) %>
   <% end %>

data/app/pb_kits/playbook/pb_highlight/highlight.html.erb

@@ -1,8 +1,7 @@
 <%= content_tag(:span,
     id: object.id,
     data: object.data,
-    class: object.classname,
-    **combined_html_options) do %>
+    class: object.classname) do %>
     <mark>
       <%= content.presence || object.text %>
     </mark>

data/app/pb_kits/playbook/pb_home_address_street/home_address_street.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("home_address_street/#{emphasis}_emphasis", props: object.send("#{emphasis}_emphasis_props")) %>
 <% end %>
 

data/app/pb_kits/playbook/pb_icon/icon.html.erb

@@ -8,8 +8,7 @@
   <%= content_tag(:i, nil,
       id: object.id,
       data: object.data,
-      class: object.classname,
-      **combined_html_options
+      class: object.classname
   ) %>
   <%= content_tag(:span, nil,
       aria: { label: "#{object.icon} icon" }.merge(object.aria),

data/app/pb_kits/playbook/pb_icon_circle/icon_circle.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("icon", props: { dark: object.dark, icon: object.icon, fixed_width: true }) %>
 <% end %>

data/app/pb_kits/playbook/pb_icon_stat_value/icon_stat_value.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("icon_circle", props: {
         dark: object.dark,

data/app/pb_kits/playbook/pb_icon_value/icon_value.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("body", props: { color: "light", dark: object.dark }) do %>
     <%= pb_rails("icon", props: { icon: object.icon, fixed_width: true }) %>
     <%= object.text %>

data/app/pb_kits/playbook/pb_image/image.html.erb

@@ -6,6 +6,5 @@
     src: object.url,
     alt: object.alt,
     onerror: object.on_error,
-    **combined_html_options
     )
-%>
+%>

data/app/pb_kits/playbook/pb_label_pill/label_pill.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("caption", props: { text: object.label, classname: "pb_label_pill_label"}) %>
       <%= pb_rails("pill", props: { text: object.pill_value, variant: object.variant, classname: "pb_label_pill_pill" }) %>
 <% end %>