playbook_ui 13.21.0.pre.alpha.PLAY120322465 → 13.21.0.pre.alpha.pbntr220improveexpansionspeed2415

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_inline_row_loading.jsx

@@ -1,6 +1,6 @@
-import React from "react"
-import { AdvancedTable } from "../.."
-import { MOCK_DATA_INLINE_LOADING } from "./_mock_data_inline_loading"
+import React from "react";
+import { AdvancedTable } from "../..";
+import { MOCK_DATA_INLINE_LOADING } from "./_mock_data_inline_loading";
 
 const AdvancedTableInlineRowLoading = (props) => {
   const columnDefinitions = [
@@ -33,7 +33,7 @@ const AdvancedTableInlineRowLoading = (props) => {
       accessor: "graduatedStudents",
       label: "Graduated Students",
     },
-  ]
+  ];
 
   //Render the subRow header rows
   const subRowHeaders = ["Quarter", "Month", "Day"]
@@ -52,7 +52,7 @@ const AdvancedTableInlineRowLoading = (props) => {
         <AdvancedTable.Body subRowHeaders={subRowHeaders}/>
       </AdvancedTable>
     </div>
-  )
-}
+  );
+};
 
-export default AdvancedTableInlineRowLoading
+export default AdvancedTableInlineRowLoading;

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_inline_row_loading.md

@@ -1,4 +1,4 @@
-As a default, the kit assumes that the initial dataset is complete, and it renders all expansion buttons/controls based on that data; if no children are present, no expansion controls are rendered. If, however, you want to change the initial dataset to omit some or all of its children (to improve load times of a complex dataset, perhaps), and you implement a querying logic that loads children only when its parent is expanded, then you must use the `inlineRowLoading` prop to ensure your expansion controls are rendered even though your child data is not yet loaded. You must also pass an empty `children` array to any node that will have children to ensure its parent maintains its ability to expand. If this prop is called AND your data contains empty `children` arrays, the kit will render expansion controls on any row with empty children, and then add an inline loading state within the expanded subrow until those child row(s) are returned to the page [by your query logic].
+As a default, the kit assumes that the initial dataset is complete, and it renders all expansion buttons/controls based on that data; if no children are present, no expansion controls are rendered. If, however, you want to change the initial dataset to omit some or all of its children (to improve load times of a complex dataset, perhaps), and you implement a querying logic that loads children only when its parent is expanded, then you must use the `inlineRowLoading` prop to ensure your expansion controls are rendered even though your child data is not yet loaded. You must also pass an empty `children` array to any node that will have children to ensure its parent maintains its ability to expand. If this prop is called AND your data contains empty `children` arrays, the kit will render expansion controls on any row with empty children, and then add an inline loading state within the expanded subrow until those child row(s) are returned to the page [by your query logic]. 
 
 In this code example, 2021 has an empty children array. Toggle it open to see the inline loading state. Once the correct data loads, this state will be replaced with the correct data rows. 
 

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_loading.jsx

@@ -1,7 +1,7 @@
-import React, { useState } from "react"
-import { AdvancedTable } from "../../"
+import React, { useState } from "react";
+import { AdvancedTable } from "../../";
 import { Button } from "../../"
-import { MOCK_DATA } from "./_mock_data"
+import { MOCK_DATA } from "./_mock_data";
 
 const AdvancedTableLoading = (props) => {
 
@@ -37,7 +37,7 @@ const [isloading, setIsLoading] = useState(true)
       accessor: "graduatedStudents",
       label: "Graduated Students",
     },
-  ]
+  ];
 
   return (
     <div>
@@ -54,7 +54,7 @@ const [isloading, setIsLoading] = useState(true)
           {...props}
       />
     </div>
-  )
-}
+  );
+};
 
-export default AdvancedTableLoading
+export default AdvancedTableLoading;

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_sort.jsx

@@ -1,6 +1,6 @@
-import React from "react"
-import { AdvancedTable } from "../.."
-import { MOCK_DATA } from "./_mock_data"
+import React from "react";
+import { AdvancedTable } from "../..";
+import { MOCK_DATA } from "./_mock_data";
 
 const AdvancedTableSort = (props) => {
   const columnDefinitions = [
@@ -33,7 +33,7 @@ const AdvancedTableSort = (props) => {
       accessor: "graduatedStudents",
       label: "Graduated Students",
     },
-  ]
+  ];
 
   return (
     <div>
@@ -46,7 +46,7 @@ const AdvancedTableSort = (props) => {
         <AdvancedTable.Body />
       </AdvancedTable>
     </div>
-  )
-}
+  );
+};
 
-export default AdvancedTableSort
+export default AdvancedTableSort;

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_sort_control.jsx

@@ -1,6 +1,6 @@
-import React, { useState } from "react"
-import { AdvancedTable } from "../.."
-import { MOCK_DATA } from "./_mock_data"
+import React, { useState } from "react";
+import { AdvancedTable } from "../..";
+import { MOCK_DATA } from "./_mock_data";
 
 const AdvancedTableSortControl = (props) => {
   const columnDefinitions = [
@@ -33,7 +33,7 @@ const AdvancedTableSortControl = (props) => {
       accessor: "graduatedStudents",
       label: "Graduated Students",
     },
-  ]
+  ];
 
   //State for sort direction
   const [isSortDesc, setIsSortDesc] = useState({desc: false})
@@ -57,7 +57,7 @@ const AdvancedTableSortControl = (props) => {
         <AdvancedTable.Body />
       </AdvancedTable>
     </div>
-  )
-}
+  );
+};
 
-export default AdvancedTableSortControl
+export default AdvancedTableSortControl;

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_subrow_headers.jsx

@@ -1,6 +1,6 @@
-import React from "react"
-import { AdvancedTable } from "../.."
-import { MOCK_DATA } from "./_mock_data"
+import React from "react";
+import { AdvancedTable } from "../..";
+import { MOCK_DATA } from "./_mock_data";
 
 const AdvancedTableSubrowHeaders = (props) => {
   const columnDefinitions = [
@@ -33,7 +33,7 @@ const AdvancedTableSubrowHeaders = (props) => {
       accessor: "graduatedStudents",
       label: "Graduated Students",
     },
-  ]
+  ];
 
   //Render the subRow header rows
   const subRowHeaders = ["Quarter", "Month", "Day"]
@@ -51,7 +51,7 @@ const AdvancedTableSubrowHeaders = (props) => {
         <AdvancedTable.Body subRowHeaders={subRowHeaders}/>
       </AdvancedTable>
     </div>
-  )
-}
+  );
+};
 
-export default AdvancedTableSubrowHeaders
+export default AdvancedTableSubrowHeaders;

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_options.jsx

@@ -1,6 +1,6 @@
-import React from "react"
-import { AdvancedTable } from "../../"
-import { MOCK_DATA } from "./_mock_data"
+import React from "react";
+import { AdvancedTable } from "../../";
+import { MOCK_DATA } from "./_mock_data";
 
 const AdvancedTableTableOptions = (props) => {
   const columnDefinitions = [
@@ -33,7 +33,7 @@ const AdvancedTableTableOptions = (props) => {
       accessor: "graduatedStudents",
       label: "Graduated Students",
     },
-  ]
+  ];
 
   const tableOptions = {
     initialState: {
@@ -55,7 +55,7 @@ const AdvancedTableTableOptions = (props) => {
           {...props}
       />
     </div>
-  )
-}
+  );
+};
 
-export default AdvancedTableTableOptions
+export default AdvancedTableTableOptions;

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_table_props.jsx

@@ -1,6 +1,6 @@
-import React from "react"
-import { AdvancedTable } from "../../"
-import { MOCK_DATA } from "./_mock_data"
+import React from "react";
+import { AdvancedTable } from "../../";
+import { MOCK_DATA } from "./_mock_data";
 
 const AdvancedTableTableProps = (props) => {
   const columnDefinitions = [
@@ -33,7 +33,7 @@ const AdvancedTableTableProps = (props) => {
       accessor: "graduatedStudents",
       label: "Graduated Students",
     },
-  ]
+  ];
 
   const tableProps = {
     container: false,
@@ -49,7 +49,7 @@ const AdvancedTableTableProps = (props) => {
           {...props}
       />
     </div>
-  )
-}
+  );
+};
 
-export default AdvancedTableTableProps
+export default AdvancedTableTableProps;

data/app/pb_kits/playbook/pb_advanced_table/docs/_mock_data.js

@@ -275,4 +275,4 @@ export const MOCK_DATA = [
       },
     ],
   },
-]
+];

data/app/pb_kits/playbook/pb_advanced_table/docs/_mock_data_inline_loading.js

@@ -196,5 +196,5 @@ export const MOCK_DATA_INLINE_LOADING = [
         },
       ],
     },
-  ]
+  ];
   

data/app/pb_kits/playbook/pb_advanced_table/docs/example.yml

@@ -1,6 +1,4 @@
 examples:
-  # rails:
-  #   - advanced_table_default: Default (Required Props)
   react:
   - advanced_table_default: Default (Required Props)
   - advanced_table_loading: Loading State

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_crumbs.scss

@@ -1,3 +1,4 @@
+@import "../tokens/border_radius";
 @import "../tokens/colors";
 @import "../tokens/opacity";
 @import "../tokens/spacing";
@@ -9,7 +10,11 @@
   display: inline-flex;
   align-items: center;
   justify-content: center;
+  border-radius: $border_rad_light;
   padding: 0 $space_xs/2;
+  border-width: 1px;
+  border-style: solid;
+  border-color: $card_light;
 
   svg {
    margin-right: 8px;
@@ -39,6 +44,8 @@
   }
 
   &.dark {
+    border-width: 0;
+
     @each $color_name, $color_value in $status_colors {
       &[class*=_#{$color_name}]  {
         background: rgba(mix($bg_dark, $color_value, 10%), $opacity_2);

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.scss

@@ -10,6 +10,7 @@
 
 [class^=pb_date_picker_kit] {
   .input_wrapper {
+    margin-bottom: $space_sm;
     position: relative;
 
     .flatpickr-wrapper {
@@ -75,4 +76,4 @@
   &:after {
     content: none;
   }
-}
+}

data/app/pb_kits/playbook/pb_date_picker/_date_picker.tsx

@@ -135,9 +135,6 @@ useEffect(() => {
   }, scrollContainer)
 })
   const filteredProps = {...props}
-  if (filteredProps.marginBottom === undefined) {
-    filteredProps.marginBottom = "sm"
-  } 
   delete filteredProps?.position
 
   const classes = classnames(

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 %>
@@ -17,7 +16,6 @@
         error: object.error,
         id: object.picker_id,
         label: object.hide_label ? nil : object.label,
-        margin_bottom: "none",
         name: object.name,
         placeholder: object.placeholder,
         required: object.required,
@@ -82,4 +80,4 @@
       }
     })
   <% end %>
-<% end %>
+<% end %>

data/app/pb_kits/playbook/pb_date_picker/date_picker.rb

@@ -75,8 +75,7 @@ module Playbook
                         default: [1900, 2100]
 
       def classname
-        default_margin_bottom = margin_bottom.present? ? "" : " mb_sm"
-        generate_classname("pb_date_picker_kit") + default_margin_bottom
+        generate_classname("pb_date_picker_kit")
       end
 
       def date_picker_config

data/app/pb_kits/playbook/pb_date_picker/date_picker.test.js

@@ -37,7 +37,7 @@ describe('DatePicker Kit', () => {
     )
 
     const kit = screen.getByTestId(testId)
-    expect(kit).toHaveClass('pb_date_picker_kit mb_sm')
+    expect(kit).toHaveClass('pb_date_picker_kit')
   })
 
   test('shows DatePicker date format m/d/Y', async () => {

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

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