playbook_ui 14.10.0.pre.alpha.play16825244 → 14.10.0.pre.alpha.play16825301

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dfffe1c453fa61d9befe70785310c0af3d7ae73b4e11df5c60327a383669dea
-  data.tar.gz: 4860df612192c0483c35c129aacfb38e8dedafd7b789d0b4c1c567ba04e70250
+  metadata.gz: bcddb88a9dfb415486e86df29a22c55884190ed39205451c9034a621311c75f8
+  data.tar.gz: 344f303ea394159d8314f69334c59620cc6f1ab1c5781768cb700e7b17ac09e4
 SHA512:
-  metadata.gz: e8d307c69d04191dfd48f551e406c318499f7838c19c3c6046caa2036c7b66316ea32d8cb5000080b3dd32ddf1dc546314d3e62af1e1169b9dfe33d6368b1b1f
-  data.tar.gz: 70caf6d01823765ae863db4cb6ffe1b4941f8cadd58cc0edebf286520bdb8bf334157c88729bd8d9e83adba8ebfcd7bcf561dbfdd548dc88f533fc9a63b5f909
+  metadata.gz: 40d48f3e79dffff5949ede088d54fbf2042a1b7f9443a84f9222d9aaa640cd4428fe4f8c19342558360c760e011a9457cff979e9d27a980446014b3bdb2db999
+  data.tar.gz: ac66fc8ced8a8332815151154d12cd7628813ddae7ea3b22b84997923228edc5efcf40c4fb2f0d08acbf565b0f4c1c6e84c7d439f3d0e226ebd96eba2b451ea7

data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_beta_subrow_headers.html.erb

@@ -36,5 +36,5 @@
 
 <%= pb_rails("advanced_table", props: { table_data: @table_data, column_definitions: column_definitions }) do %>
   <%= pb_rails("advanced_table/table_header", props: { column_definitions: column_definitions }) %>
-  <%= pb_rails("advanced_table/table_body", props: { id: "subrow_headers", table_data: @table_data, column_definitions: column_definitions, subrow_headers: subrow_headers, enable_toggle_expansion: "all" }) %>
+  <%= pb_rails("advanced_table/table_body", props: { id: "test_table", table_data: @table_data, column_definitions: column_definitions, subrow_headers: subrow_headers, enable_toggle_expansion: "all" }) %>
 <% end %>

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

@@ -1,3 +1,3 @@
 `subrow_headers` is an optional prop that if present will add header rows at each level of the nested data. The prop takes an array of strings, each string being the text for each header row. The array of strings must be in the order in which they need to be rendered in the UI according to depth.
 
-`enable_toggle_expansion` is an additional optional prop that can be used in conjunction with the subRowHeaders prop. `enable_toggle_expansion` is a string that can be "all", "header" or "none". If set to "all", the toggle exapansion button will appear in the table header as well as in the subRow headers. If set to "header" button will only appear in header and NOT in subRow headers. This is set to "header" by default.
+`enable_toggle_expansion` is an additional optional prop that can be used in conjunction with the subRowHeaders prop. `enable_toggle_expansion` is a string that can be "all", "header" or "none". If set to "all", the toggle expansion button will appear in the table header as well as in the subRow headers. If set to "header", the button will only appear in header and NOT in subRow headers. This prop is set to "header" by default.

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

@@ -1,7 +1,7 @@
 examples:
   rails:
   - advanced_table_beta: Default (Required Props)
-  # - advanced_table_beta_subrow_headers: SubRow Headers
+  - advanced_table_beta_subrow_headers: SubRow Headers
   - advanced_table_collapsible_trail_rails: Collapsible Trail
   - advanced_table_beta_sort: Enable Sorting
   - advanced_table_custom_cell_rails: Custom Components for Cells

data/app/pb_kits/playbook/pb_advanced_table/index.js

@@ -65,8 +65,7 @@ export default class PbAdvancedTable extends PbEnhancedElement {
         if (!dataContent) {
           return;
         }
-
-        // Split the dataContent to get all ancestor IDs, check against simpleExpandedRows
+        // Split the dataContent to get all ancestor IDs, check against ExpandedRows
         const ancestorIds = dataContent.split("-").slice(0, -1);
 
         const prefixedAncestorIds = ancestorIds.map(
@@ -76,7 +75,22 @@ export default class PbAdvancedTable extends PbEnhancedElement {
           PbAdvancedTable.expandedRows.has(id)
         );
 
-        if (allAncestorsExpanded) {
+        const checkIfParentIsExpanded = () => {
+          if (dataContent.endsWith("sr")) {
+            const parentRowId = childRow.dataset.rowParent;
+            const isParentVisible =
+              childRow.previousElementSibling.classList.contains("is-visible");
+            if (parentRowId) {
+              const isInSet = PbAdvancedTable.expandedRows.has(parentRowId);
+              if (isInSet && isParentVisible) {
+                return true;
+              }
+            }
+          }
+          return false;
+        };
+
+        if (allAncestorsExpanded || checkIfParentIsExpanded()) {
           childRow.style.display = "table-row";
           childRow.classList.add("is-visible");
         } else {
@@ -143,7 +157,7 @@ export default class PbAdvancedTable extends PbEnhancedElement {
   static handleToggleAllHeaders(element) {
     const table = element.closest(".pb_table");
     const firstLevelButtons = table.querySelectorAll(
-      ".pb_advanced_table_body > .pb_table_tr [data-advanced-table]"
+      ".pb_advanced_table_body > .pb_table_tr[data-row-depth='0'] [data-advanced-table]"
     );
 
     const allExpanded = Array.from(firstLevelButtons).every(
@@ -175,12 +189,43 @@ export default class PbAdvancedTable extends PbEnhancedElement {
     }
   }
 
-  // static handleToggleAllSubRows(element, rowDepth) {}
+  static handleToggleAllSubRows(element, rowDepth) {
+    const table = element.closest(".pb_table");
+    const parentRow = element.closest("tr");
+    if (!parentRow) {
+      return;
+    }
+    const rowParentId = parentRow.dataset.rowParent;
+    // Select all buttons that for subrows at that depth and with same rowParent
+    const subRowButtons = table.querySelectorAll(
+      `.pb_advanced_table_body > .pb_table_tr[data-row-depth='${rowDepth}'].pb_table_tr[data-row-parent='${rowParentId}'] [data-advanced-table]`
+    );
+
+    const allExpanded = Array.from(subRowButtons).every(
+      (button) =>
+        button.querySelector(UP_ARROW_SELECTOR).style.display === "inline-block"
+    );
+
+    if (allExpanded) {
+      subRowButtons.forEach((button) => {
+        button.click();
+        PbAdvancedTable.expandedRows.delete(button.id);
+      });
+    } else {
+      subRowButtons.forEach((button) => {
+        if (!PbAdvancedTable.expandedRows.has(button.id)) {
+          button.click();
+          PbAdvancedTable.expandedRows.add(button.id);
+        }
+      });
+    }
+  }
 }
 
 window.expandAllRows = (element) => {
   PbAdvancedTable.handleToggleAllHeaders(element);
 };
-// window.expandAllSubRows = (element, rowDepth) => {
-//   PbAdvancedTable.handleToggleAllSubRows(element, rowDepth);
-// };
+
+window.expandAllSubRows = (element, rowDepth) => {
+  PbAdvancedTable.handleToggleAllSubRows(element, rowDepth);
+};

data/app/pb_kits/playbook/pb_advanced_table/table_body.rb

@@ -31,7 +31,7 @@ module Playbook
         end.compact
       end
 
-      def render_row_and_children(row, column_definitions, current_depth, first_parent_child, ancestor_ids = [], top_parent_id = nil)
+      def render_row_and_children(row, column_definitions, current_depth, first_parent_child, ancestor_ids = [], top_parent_id = nil, additional_classes: "", table_data_attributes: {})
         top_parent_id ||= row.object_id
         new_ancestor_ids = ancestor_ids + [row.object_id]
         leaf_columns = flatten_columns(column_definitions)
@@ -39,30 +39,35 @@ module Playbook
         output = ActiveSupport::SafeBuffer.new
         is_first_child_of_subrow = current_depth.positive? && first_parent_child && subrow_headers[current_depth - 1].present?
 
-        output << pb_rails("advanced_table/table_subrow_header", props: { row: row, column_definitions: column_definitions, depth: current_depth, subrow_header: subrow_headers[current_depth - 1], collapsible_trail: collapsible_trail }) if is_first_child_of_subrow && enable_toggle_expansion == "all"
+        subrow_ancestor_ids = ancestor_ids + ["#{row.object_id}sr"]
+        subrow_data_attributes = {
+          advanced_table_content: subrow_ancestor_ids.join("-"),
+          row_depth: current_depth,
+          row_parent: "#{id}_#{ancestor_ids.last}",
+        }
+        # Subrow header if applicable
+        output << pb_rails("advanced_table/table_subrow_header", props: { row: row, column_definitions: leaf_columns, depth: current_depth, subrow_header: subrow_headers[current_depth - 1], collapsible_trail: collapsible_trail, classname: "toggle-content", subrow_data_attributes: subrow_data_attributes }) if is_first_child_of_subrow && enable_toggle_expansion == "all"
 
-        # Pass only leaf_columns to table_row to account for multiple nested columns
-        output << pb_rails("advanced_table/table_row", props: {
-                             id: id,
-                             row: row,
-                             column_definitions: leaf_columns,
-                             depth: current_depth,
-                             collapsible_trail: collapsible_trail,
-                           })
+        current_data_attributes = current_depth.zero? ? { row_depth: 0 } : table_data_attributes
+
+        # Additional class and data attributes needed for toggle logic
+        output << pb_rails("advanced_table/table_row", props: { id: id, row: row, column_definitions: leaf_columns, depth: current_depth, collapsible_trail: collapsible_trail, classname: additional_classes, table_data_attributes: current_data_attributes })
 
         if row[:children].present?
-          output << row[:children].map do |child_row|
+          row[:children].each do |child_row|
             is_first_child = row[:children].first == child_row
-
-            child_output = render_row_and_children(child_row, column_definitions, current_depth + 1, is_first_child, new_ancestor_ids, top_parent_id)
-
             immediate_parent_id = row.object_id
-            top_parent = top_parent_id
-            # Combine ancestor_ids to build the content id
             data_content = new_ancestor_ids.join("-") + "-#{child_row.object_id}"
 
-            child_output.to_str.sub("<tr", %(<tr class="toggle-content" data-top-parent="#{id}_#{top_parent}" data-row-depth="#{current_depth}" data-row-parent="#{id}_#{immediate_parent_id}" data-advanced-table-content="#{data_content}"))
-          end.join.html_safe
+            child_data_attributes = {
+              top_parent: "#{id}_#{top_parent_id}",
+              row_depth: current_depth + 1,
+              row_parent: "#{id}_#{immediate_parent_id}",
+              advanced_table_content: data_content,
+            }
+
+            output << render_row_and_children(child_row, column_definitions, current_depth + 1, is_first_child, new_ancestor_ids, top_parent_id, additional_classes: "toggle-content", table_data_attributes: child_data_attributes)
+          end
         end
 
         output

data/app/pb_kits/playbook/pb_advanced_table/table_row.rb

@@ -11,6 +11,12 @@ module Playbook
       prop :depth
       prop :collapsible_trail, type: Playbook::Props::Boolean,
                                default: true
+      prop :table_data_attributes, type: Playbook::Props::HashProp,
+                                   default: {}
+
+      def data
+        Hash(prop(:data)).merge(table_data_attributes)
+      end
 
       def classname
         generate_classname("pb_table_tr", "bg-white", subrow_depth_classname, separator: " ")

data/app/pb_kits/playbook/pb_advanced_table/table_subrow_header.html.erb

@@ -1,6 +1,6 @@
-<%= pb_content_tag(:div) do %>
+<%= pb_content_tag(:tr) do %>
         <% object.column_definitions.each_with_index do |column, index| %>
-            <%= pb_rails("table/table_cell", props: { classname: object.td_classname}) do %>
+            <%= pb_rails("table/table_cell", props: { classname: "id-cell chrome-styles"}) do %>
                 <%= pb_rails("flex", props:{ align: "center", justify: "start" }) do %>
                     <% if collapsible_trail && index.zero? %>
                         <% (1..depth).each do |i| %>

data/app/pb_kits/playbook/pb_advanced_table/table_subrow_header.rb

@@ -14,13 +14,15 @@ module Playbook
                            default: ""
       prop :collapsible_trail, type: Playbook::Props::Boolean,
                                default: true
+      prop :subrow_data_attributes, type: Playbook::Props::HashProp,
+                                    default: {}
 
-      def classname
-        generate_classname("pb_table_tr", "bg-white", subrow_depth_classname, separator: " ")
+      def data
+        Hash(prop(:data)).merge(subrow_data_attributes)
       end
 
-      def td_classname
-        generate_classname("id-cell", "chrome-styles", separator: " ")
+      def classname
+        generate_classname("pb_table_tr", "bg-silver", "pb_subrow_header", subrow_depth_classname, separator: " ")
       end
 
     private

data/app/pb_kits/playbook/pb_avatar_action_button/_avatar_action_button.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 [class^=pb_avatar_action_button_kit] {
 
   $icon_size: 0px;
@@ -13,7 +15,7 @@
       color: $value;
     }
   }
-  
+
   @mixin icon-base {
     &.dark{
         background-color: $bg_dark
@@ -31,22 +33,22 @@
   }
 
   @each $name, $size in $avatar-sizes {
-    
+
     &[class*=_#{$name}] {
-      
+
       $avatar_size: map-get($avatar-sizes, $name);
-      $icon_size: $avatar_size / 2;
-      $border_size: $icon_size / 10;
+      $icon_size: math.div($avatar_size, 2);
+      $border_size: math.div($icon_size, 10);
 
       position: relative;
       width: $avatar_size * 1.25;
       height: $avatar_size * 1.1;
       display: flex;
-    
+
       [class^=pb_tooltip_kit] {
         justify-self: center;
       }
-    
+
       &[class*=_bottom] .icon {
         @include icon-base;
         top: $icon_size * 1.27;
@@ -59,8 +61,8 @@
         left: $icon_size * 1.5;
       }
       &[class*=_left] [class^=pb_avatar_kit] {
-        padding-left: $icon_size / 2;
+        padding-left: math.div($icon_size , 2);
       }
     }
   }
-}
+}

data/app/pb_kits/playbook/pb_badge/_badge.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 @import "../tokens/border_radius";
 @import "../tokens/colors";
 @import "../tokens/opacity";
@@ -11,7 +13,7 @@
   align-items: center;
   justify-content: center;
   border-radius: $border_rad_light;
-  padding: 0 $space_xs/2;
+  padding: 0 math.div($space_xs, 2);
   border-width: 1px;
   border-style: solid;
   border-color: $card_light;
@@ -34,7 +36,7 @@
     height: $pb_badge_height;
     min-height: $pb_badge_height;
     min-width: $pb_badge_height;
-    border-radius: $pb_badge_height / 2;
+    border-radius: math.div($pb_badge_height, 2);
   }
 
   &[class*=_notification] {

data/app/pb_kits/playbook/pb_bread_crumbs/_bread_crumbs.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 @import "../tokens/colors";
 @import "../tokens/opacity";
 @import "../tokens/spacing";
@@ -9,7 +11,7 @@
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  padding: 0 $space_xs/2;
+  padding: 0 math.div($space_xs, 2);
 
   svg {
    margin-right: 8px;

data/app/pb_kits/playbook/pb_button/_button.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 @import "./button_mixins";
 @import "../tokens/colors";
 @import "../tokens/border_radius";
@@ -17,7 +19,7 @@ $pb_button_sizes: (
   @each $name, $size in $pb_button_sizes {
     &[class*=size_#{$name}] {
       font-size: $size;
-      padding: $size / 2 $size * 2.42;
+      padding: math.div($size, 2) $size * 2.42;
       @if $name == "sm" {
         min-height: 0;
       }

data/app/pb_kits/playbook/pb_circle_icon_button/_circle_icon_button.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 @import "../pb_button/button";
 @import "../pb_button/button_mixins";
 
@@ -16,7 +18,7 @@ $pb_button_styles: (
   flex-grow: 0;
   width: $pb_button_size;
   height: $pb_button_size;
-  border-radius: $pb_button_size / 2;
+  border-radius: math.div($pb_button_size, 2);
   line-height: $pb_button_size;
   flex-basis: $pb_button_size;
   min-width: $pb_button_size;
@@ -53,4 +55,4 @@ $pb_button_styles: (
       }
     }
   }
-}
+}

data/app/pb_kits/playbook/pb_date_picker/sass_partials/_input_styles.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 @import "../../pb_textarea/textarea_mixin";
 
 [class^=pb_date_picker_kit] {
@@ -41,7 +43,7 @@
   &.error {
     .date_picker_input_wrapper {
       [class*=pb_body_kit] {
-        margin-top: $space_xs / 2;
+        margin-top: math.div($space_xs, 2);
       }
 
       input,

data/app/pb_kits/playbook/pb_date_picker/sass_partials/_overrides.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 @media (min-width: 500px) {
   .flatpickr-calendar {
     padding: $space_xs;
@@ -6,8 +8,8 @@
     width: 315.88px
   }
   .flatpickr-months {
-    margin-left: $space_xs / 4;
-    margin-top: $space_xs / 3;
+    margin-left: math.div($space_xs, 4);
+    margin-top: math.div($space_xs, 3);
   }
 }
 @media (max-width: 499px) {
@@ -19,7 +21,7 @@
   }
 }
 // Firefox Header Adjustments
-@supports (-moz-appearance:none) { 
+@supports (-moz-appearance:none) {
   select.flatpickr-monthDropdown-months {
       width: 97px !important;
       margin-left: $space_xs + 3;

data/app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 [class^=pb_date_range_inline_kit] {
   &[class*=_center]  {
     & > [class^=pb_caption],
@@ -21,14 +23,14 @@
     display: flex;
     align-items: center;
     [class*=pb_date_range_inline_arrow] {
-      margin-left: $space_xs/2;
-      margin-right: $space_xs/2;
+      margin-left: math.div($space_xs, 2);
+      margin-right: math.div($space_xs, 2);
     }
     [class*=pb_date_range_inline_timezone] {
-      margin-left: $space_xs/2;
+      margin-left: math.div($space_xs, 2);
     }
     [class*=pb_date_range_inline_icon] {
-      margin-right: $space_xs/2;
+      margin-right: math.div($space_xs, 2);
     }
   }
 }

data/app/pb_kits/playbook/pb_date_time_stacked/_date_time_stacked.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 [class^=pb_date_time_stacked] {
 
   [class^=padding_month] {
@@ -19,7 +21,7 @@
 
 }
 .date-time-padding {
-  padding-right: $space_xs / 2;
-  padding-left: $space_xs / 2;
+  padding-right: math.div($space_xs, 2);
+  padding-left: math.div($space_xs, 2);
 }
 

data/app/pb_kits/playbook/pb_dropdown/_dropdown.scss

@@ -1,3 +1,5 @@
+@use "sass:math";
+
 @import "../tokens/colors";
 @import "../tokens/spacing";
 @import "../tokens/typography";
@@ -122,7 +124,7 @@
 
     &.error {
       [class*=pb_body_kit] {
-        margin-top: $space_xs / 2;
+        margin-top: math.div($space_xs, 2);
       }
 
       [class*="dropdown_trigger_wrapper"] {
@@ -146,7 +148,7 @@
   &[class*="subtle"] {
     .dropdown_wrapper {
       .pb_dropdown_container {
-        
+
         [class*="pb_dropdown_option"]:first-child {
           margin-top: $space_xs;
         }
@@ -161,7 +163,7 @@
           border-radius: $border_radius_md;
           border-bottom: none;
           position: relative;
-        
+
           &::after {
             content: "";
             position: absolute;
@@ -172,20 +174,20 @@
             background: $border_light;
           }
         }
-        
+
         [class*="pb_dropdown_option"]:last-child::after {
-          display: none; 
+          display: none;
         }
       }
     }
-  
+
     &[class*="separators_hidden"] {
       .dropdown_wrapper {
         .pb_dropdown_container {
           [class*="pb_dropdown_option"]:first-child {
             margin-top: $space_xs;
           }
-  
+
           [class*="pb_dropdown_option"]:last-child {
             margin-bottom: $space_xs;
           }
@@ -193,7 +195,7 @@
           [class*="pb_dropdown_option"] {
             padding: $space_xxs $space_xs;
             margin: $space_xxs $space_xs;
-     
+
             &::after {
               height: 0px;
             }

data/app/pb_kits/playbook/pb_file_upload/_file_upload.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useCallback, useRef } from 'react'
-import { useDropzone, DropzoneInputProps, DropzoneRootProps } from 'react-dropzone'
+import { useDropzone, DropzoneInputProps, DropzoneRootProps, FileRejection } from 'react-dropzone'
 import classnames from 'classnames'
 
 import { buildCss, buildDataProps, noop, buildHtmlProps } from '../utilities/props'
@@ -9,8 +9,10 @@ import type { Callback } from '../types'
 import Body from '../pb_body/_body'
 import Card from '../pb_card/_card'
 
+import { isEmpty } from '../utilities/object'
+
 type FileUploadProps = {
-  accept?: string[],
+  accept?: Record<string, string[]>,
   className?: string,
   customMessage?: string,
   dark?: boolean,
@@ -19,7 +21,7 @@ type FileUploadProps = {
   acceptedFilesDescription?: string,
   maxSize?: number,
   onFilesAccepted: Callback<File, File>,
-  onFilesRejected: (error: string, files: File[]) => void,
+  onFilesRejected: (error: string, files: readonly FileRejection[]) => void,
 }
 
 const getFormattedFileSize = (fileSize: number): string => {
@@ -28,7 +30,7 @@ const getFormattedFileSize = (fileSize: number): string => {
 
 const FileUpload = (props: FileUploadProps): React.ReactElement => {
   const {
-    accept = null,
+    accept = {},
     acceptedFilesDescription = '',
     className,
     customMessage,
@@ -48,30 +50,37 @@ const FileUpload = (props: FileUploadProps): React.ReactElement => {
     getRootProps: () => DropzoneRootProps & any;
     getInputProps: () => DropzoneInputProps & any;
     isDragActive: boolean;
-    rejectedFiles: File[];
+    fileRejections: readonly FileRejection[];
   }
 
-  const { getRootProps, getInputProps, isDragActive, rejectedFiles }: DropZoneProps = useDropzone({
+  const { getRootProps, getInputProps, isDragActive, fileRejections }: DropZoneProps = useDropzone({
     accept,
     maxSize,
     onDrop,
   })
 
-  const prevRejected = useRef<File[] | null>(null);
+  const prevRejected = useRef<readonly FileRejection[] | null>(null);
 
-  const maxFileSizeText = `Max file size is ${getFormattedFileSize(maxSize)}.`
+  let maxFileSizeText = ''
+  if (maxSize !== undefined) {
+    maxFileSizeText = `Max file size is ${getFormattedFileSize(maxSize)}.`
+  }
 
   useEffect(() => {
-    if (rejectedFiles === prevRejected.current) return
-    const isFileTooLarge = maxSize && rejectedFiles.length > 0 && rejectedFiles[0].size > maxSize;
+    if (fileRejections === prevRejected.current) return
+    const isFileTooLarge = maxSize && fileRejections.length > 0 && fileRejections[0].file.size > maxSize;
     if (isFileTooLarge) {
-      onFilesRejected(`File size is too large! ${maxFileSizeText}`, rejectedFiles)
+      onFilesRejected(`File size is too large! ${maxFileSizeText}`, fileRejections)
     }
-    prevRejected.current = rejectedFiles
-  }, [maxFileSizeText, maxSize, onFilesRejected, rejectedFiles])
+    prevRejected.current = fileRejections
+  }, [maxFileSizeText, maxSize, onFilesRejected, fileRejections])
 
   const acceptedFileTypes = () => {
-    return accept.map((fileType) => {
+    if (!accept) {
+      return []
+    }
+
+    return Object.keys(accept).map((fileType) => {
       if (fileType.startsWith('image/')) {
         return fileType.replace('image/', ' ')
       } else {
@@ -86,7 +95,7 @@ const FileUpload = (props: FileUploadProps): React.ReactElement => {
   const getDescription = () => {
     return customMessage
       ? customMessage
-      : `Choose a file or drag it here.${accept === null ? '' : ` The accepted file types are: ${acceptedFilesDescription || acceptedFileTypes()}.`}${maxSize ? ` ${maxFileSizeText}` : ''}`;
+      : `Choose a file or drag it here.${isEmpty(accept) ? '' : ` The accepted file types are: ${acceptedFilesDescription || acceptedFileTypes()}.`}${maxSize ? ` ${maxFileSizeText}` : ''}`;
   }
 
   return (

data/app/pb_kits/playbook/pb_file_upload/docs/_file_upload_accept.jsx

@@ -28,7 +28,9 @@ const FileUploadAccept = (props) => {
           {...props}
       />
       <FileUpload
-          accept={['image/svg+xml']}
+          accept={{
+            "image/svg+xml": [".svg", ".xml"],
+          }}
           onFilesAccepted={handleOnFilesAccepted}
           {...props}
       />

data/app/pb_kits/playbook/pb_file_upload/docs/_file_upload_custom_description.jsx

@@ -25,7 +25,10 @@ const FileUploadCustomDescription = (props) => {
           {...props}
       />
       <FileUpload
-          accept={['application/pdf','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
+          accept={{
+            "application/pdf": [".pdf"],
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": [".xlsx"],
+          }}
           acceptedFilesDescription="Adobe (.pdf) and Microsoft (.xslx)"
           onFilesAccepted={handleOnFilesAccepted}
           {...props}

data/app/pb_kits/playbook/pb_file_upload/docs/_file_upload_max_size.jsx

@@ -18,7 +18,7 @@ const AcceptedFilesList = ({ files }) => (
 const RejectedFilesList = ({ files }) => (
   <List>
     {files.map((file) => (
-      <ListItem key={file.name}><Body color="error">{`${file.name} (file too large)`}</Body></ListItem>
+      <ListItem key={file.file.name}><Body color="error">{`${file.file.name} (file too large)`}</Body></ListItem>
     ))}
   </List>
 )