playbook_ui 15.3.0.pre.alpha.PLAY2407daterangeinlineshowcurrentyear12138 → 15.3.0.pre.alpha.PLAY2565formkitsubmitfix11681

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

@@ -350,14 +350,8 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
   if (syncStartWith) {
     picker.config.onClose.push((selectedDates: string) => {
       if (selectedDates?.length) {
-        const element = document.querySelector(`#${syncStartWith}`) as any;
-        // Check if it's a Dropdown QuickPick (has _dropdownRef) or DatePicker QuickPick (has _flatpickr)
-        if (element?._dropdownRef?.current) {
-          element._dropdownRef.current.clearSelected();
-        } else {
-          const quickpick = element?._flatpickr;
-          quickpick?.clear();
-        }
+        const quickpick = (document.querySelector(`#${syncStartWith}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
+        quickpick?.clear();
       }
     });
   }
@@ -366,14 +360,8 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
   if (syncEndWith) {
     picker.config.onClose.push((selectedDates: string) => {
       if (selectedDates?.length) {
-        const element = document.querySelector(`#${syncEndWith}`) as any;
-        // Check if it's a Dropdown QuickPick (has _dropdownRef) or DatePicker QuickPick (has _flatpickr)
-        if (element?._dropdownRef?.current) {
-          element._dropdownRef.current.clearSelected();
-        } else {
-          const quickpick = element?._flatpickr;
-          quickpick?.clear();
-        }
+        const quickpick = (document.querySelector(`#${syncEndWith}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
+        quickpick?.clear();
       }
     });
   }

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

@@ -48,8 +48,7 @@ examples:
   - date_picker_quick_pick_custom: Custom Quick Pick Dates
   - date_picker_quick_pick_custom_override: Custom Quick Pick Dates (append to defaults)
   - date_picker_quick_pick_default_date: Range (Quick Pick w/ Default Date)
-  # - date_picker_range_pattern: Range with 2 Date Pickers and a Quick Pick
-  - date_picker_and_dropdown_range: Range with Dropdown and 2 Date Pickers
+  - date_picker_range_pattern: Range with 2 Date Pickers and a Quick Pick
   - date_picker_format: Format
   - date_picker_disabled: Disabled Dates
   - date_picker_min_max: Min Max

data/app/pb_kits/playbook/pb_date_picker/docs/index.js

@@ -26,5 +26,4 @@ export { default as DatePickerOnClose } from './_date_picker_on_close.jsx'
 export { default as DatePickerQuickPickCustom } from './_date_picker_quick_pick_custom'
 export { default as DatePickerQuickPickCustomOverride } from './_date_picker_quick_pick_custom_override'
 export { default as DatePickerQuickPickDefaultDate } from './_date_picker_quick_pick_default_date'
-export { default as DatePickerRangePattern } from './_date_picker_range_pattern'
-export { default as DatePickerAndDropdownRange } from './_date_picker_and_dropdown_range.jsx'
+export { default as DatePickerRangePattern } from './_date_picker_range_pattern'

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

@@ -9,20 +9,29 @@ $pb_card_border_radius: $border_rad_heavier;
 
 // used to display dropdown on the left of the calender
 .quick-pick-drop-down {
-  width: 100%;
+  width: auto;
+  display: grid;
 }
 
 .quick-pick-ul {
+  padding: $space_xs 0px;
   margin: 0;
   list-style: none;
 }
 
 .nav-item {
   list-style: none;
+  border-radius: 6px;
+  border-bottom: 0;
+  margin: $space_xs $space_sm;
 }
 
 .nav-item-link {
   text-decoration: none;
+  border-width: $pb_card_border_width;
+  border-style: solid;
+  border-color: $border_light;
+  border-radius: $pb_card_border_radius;
   padding: $space_xs 14px;
   transition-property: color, background-color;
   transition-duration: 0.15s;
@@ -31,21 +40,15 @@ $pb_card_border_radius: $border_rad_heavier;
   color: $charcoal;
   font-size: $font_default;
   font-weight: $regular;
-  text-align: left;
-  border-bottom: 1px solid $border_light;
   &.active {
-    color: $white;
-    background-color: $primary;
-    &:hover {
-      background-color: $product_1_background;
-      color: $white;
-    }
+    border-width: 2px;
+    border-color: $primary;
   }
   @media (hover:hover) {
     &:hover {
       cursor: pointer;
-      background-color: $bg_light;
-      color: $primary;
+      box-shadow: $shadow-deep;
+      border-color: $slate;
     }
   }
 }
@@ -54,3 +57,19 @@ $pb_card_border_radius: $border_rad_heavier;
 .quick-pick-drop-down > .flatpickr-months, .quick-pick-drop-down > .flatpickr-innerContainer {
   display: none;
 }
+
+@media only screen and (max-width: 767px) {
+  .quick-pick-ul {
+    padding: $space_xs $space_xs;
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+  }
+
+  .nav-item {
+    margin: $space_xxs $space_xs;
+  }
+
+  .nav-item-link {
+    padding: $space_xs $space_xxs;
+  }
+}

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

@@ -19,7 +19,6 @@ type DateRangeInlineProps = {
   icon?: boolean;
   id?: string;
   size?: "sm" | "xs";
-  showCurrentYear?: boolean;
   startDate?: Date;
 };
 
@@ -46,7 +45,6 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
     icon = false,
     size = "sm",
     startDate,
-    showCurrentYear = false,
   } = props;
 
   const dateInCurrentYear = () => {
@@ -62,10 +60,13 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
   const htmlProps = buildHtmlProps(htmlOptions);
   
   const renderTime = (date: Date) => {
-    const includeYear = showCurrentYear || !dateInCurrentYear();
     return (
       <time dateTime={dateTimeIso(date)}>
-        {` ${dateTimestamp(date, includeYear)} `}
+        {dateInCurrentYear() ? (
+          ` ${dateTimestamp(date, false)} `
+        ) : (
+          ` ${dateTimestamp(date, true)} `
+        )}
       </time>
     );
   };
@@ -82,8 +83,7 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
             {icon && (
               <Caption 
                   dark={dark} 
-                  tag="span"
-              >
+                  tag="span">
                 <Icon
                     className="pb_date_range_inline_icon"
                     dark={dark}
@@ -96,14 +96,12 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
             )}
             <Caption 
                 dark={dark} 
-                tag="span"
-            >
+                tag="span">
               {renderTime(startDate)}
             </Caption>
             <Caption 
                 dark={dark} 
-                tag="span"
-            >
+                tag="span">
               <Icon
                   className="pb_date_range_inline_arrow"
                   dark={dark}
@@ -114,8 +112,7 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
             </Caption>
             <Caption 
                 dark={dark} 
-                tag="span"
-            >
+                tag="span">
               {renderTime(endDate)}
             </Caption>
           </>
@@ -127,8 +124,7 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
               <Body 
                   color={"light"} 
                   dark={dark}
-                  tag="span"
-              >
+                  tag="span">
                 <Icon
                     className="pb_date_range_inline_icon"
                     dark={dark}
@@ -141,15 +137,13 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
             )}
             <Body 
                 dark={dark} 
-                tag="span"
-            >
+                tag="span">
               {renderTime(startDate)}
             </Body>
             <Body 
                 color={"light"} 
                 dark={dark} 
-                tag="span"
-            >
+                tag="span">
               <Icon
                   className="pb_date_range_inline_arrow"
                   dark={dark}
@@ -160,8 +154,7 @@ const DateRangeInline = (props: DateRangeInlineProps): React.ReactElement => {
             </Body>
             <Body 
                 dark={dark} 
-                tag="span"
-            >
+                tag="span">
               {renderTime(endDate)}
             </Body>
           </>

data/app/pb_kits/playbook/pb_date_range_inline/date_range_inline.rb

@@ -14,8 +14,7 @@ module Playbook
       prop :align, type: Playbook::Props::Enum,
                    values: %w[left center right],
                    default: "left"
-      prop :show_current_year, type: Playbook::Props::Boolean,
-                               default: false
+
       def classname
         generate_classname("pb_date_range_inline_kit", dark_class, align)
       end
@@ -39,12 +38,11 @@ module Playbook
       end
 
       def time_display(time)
-        include_year = show_current_year || !dates_in_current_year?
         content_tag(:time, datetime: time.to_iso) do
-          if include_year
-            "#{time.to_month_downcase} #{time.to_day}, #{time.to_year}"
-          else
+          if dates_in_current_year?
             "#{time.to_month_downcase} #{time.to_day}"
+          else
+            "#{time.to_month_downcase} #{time.to_day}, #{time.to_year}"
           end
         end
       end

data/app/pb_kits/playbook/pb_date_range_inline/date_range_inline.test.js

@@ -111,23 +111,6 @@ describe("DateRangeInline Kit", () => {
         const text = kit.querySelector('.pb_caption_kit_md:first-child')
         expect(text.textContent).toEqual(" Jan 15 ")
     })
-
-    test("renders DateRangeInline with year when showCurrentYear is true", () => {
-        const currentYear = new Date().getFullYear()
-        render(
-            <DateRangeInline
-                data={{ testid: testId }}
-                endDate={new Date((`15 Aug ${currentYear}`))}
-                showCurrentYear
-                size="xs"
-                startDate={new Date(`15 Jan ${currentYear}`)}
-            />
-        )
-
-        const kit = screen.getByTestId(testId)
-        const text = kit.querySelector('.pb_caption_kit_md:first-child')
-        expect(text.textContent).toEqual(` Jan 15, ${currentYear} `)
-    })
     
 
 })

data/app/pb_kits/playbook/pb_date_range_inline/docs/_description.md

@@ -1 +1 @@
-Use to display a date range.
+Use to display a date range. Year will not show if it is the current year.

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

@@ -2,12 +2,11 @@ examples:
   
   rails:
   - date_range_inline_default: Default
-  - date_range_inline_show_current_year: Show Current Year
+  
   
   react:
   - date_range_inline_default: Default
-  - date_range_inline_show_current_year: Show Current Year
-  
+
   swift:
   - date_range_inline_default_swift: Default
   - date_range_inline_props_swift: ""

data/app/pb_kits/playbook/pb_date_range_inline/docs/index.js

@@ -1,2 +1 @@
 export { default as DateRangeInlineDefault } from './_date_range_inline_default.jsx'
-export { default as DateRangeInlineShowCurrentYear } from './_date_range_inline_show_current_year.jsx'

data/app/pb_kits/playbook/pb_distribution_bar/docs/_distribution_bar_custom_colors.md

@@ -1 +1 @@
-You can customize the order of the colors you would like to use by using the `colors` prop. Only the data and status colors will work for Playbook charts. See the [design page](https://playbook.powerapp.cloud/token/colors) for reference.
+You can customize the order of the colors you would like to use by using the `colors` prop. Only the data and status colors will work for Playbook charts. See the [design page](/visual_guidelines) for reference.

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

@@ -12,7 +12,6 @@
 
 .pb_dropdown_default,
 .pb_dropdown_subtle,
-.pb_dropdown_quickpick,
 .pb_dropdown_default_separators_hidden,
 .pb_dropdown_subtle_separators_hidden {
   .dropdown_wrapper {

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

@@ -12,7 +12,6 @@ import DropdownContext from "./context";
 import DropdownOption from "./subcomponents/DropdownOption";
 import DropdownTrigger from "./subcomponents/DropdownTrigger";
 import useDropdown from "./hooks/useDropdown";
-import  getQuickPickOptions from "./quickpick";
 
 import {
     separateChildComponents,
@@ -37,12 +36,9 @@ type DropdownProps = {
     label?: string;
     multiSelect?: boolean;
     onSelect?: (arg: GenericObject) => null;
-    options?: GenericObject;
+    options: GenericObject;
     separators?: boolean;
-    variant?: "default" | "subtle" | "quickpick";
-    rangeEndsToday?: boolean;
-    controlsStartId?: string;
-    controlsEndId?: string;
+    variant?: "default" | "subtle";
     activeStyle?: {
       backgroundColor?: string;
       fontColor?: string;
@@ -75,9 +71,6 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
         formPillProps,
         onSelect,
         options,
-        rangeEndsToday = false,
-        controlsStartId,
-        controlsEndId,
         separators = true,
         variant = "default",
         activeStyle,
@@ -92,25 +85,11 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
         globalProps(props),
         className
     );
-    // ------------- Quick Pick ---------------------------------
-    // Use QuickPick options when variant is "quickpick"
-    const dropdownOptions = variant === "quickpick" 
-        ? getQuickPickOptions(rangeEndsToday) 
-        : (options || []);
-    // ----------------------------------------------------------
 
     const [isDropDownClosed, setIsDropDownClosed, toggleDropdown] = useDropdown(isClosed);
 
     const [filterItem, setFilterItem] = useState("");
     const initialSelected = useMemo(() => {
-      // Handle quickpick variant with string defaultValue (e.g., "This Month")
-      if (variant === "quickpick" && typeof defaultValue === "string" && defaultValue) {
-        const matchedOption = dropdownOptions.find(
-          (opt: GenericObject) => opt.label?.toLowerCase() === (defaultValue as string).toLowerCase()
-        );
-        return matchedOption || {};
-      }
-      
       if (multiSelect) {
         if (Array.isArray(defaultValue)) return defaultValue;
         return defaultValue && Object.keys(defaultValue).length
@@ -118,7 +97,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
           : [];
       }
       return defaultValue || {};
-    }, [multiSelect, defaultValue, variant, dropdownOptions]);
+    }, [multiSelect, defaultValue]);
 
     const [selected, setSelected] = useState<GenericObject | GenericObject[]>(
       initialSelected
@@ -172,7 +151,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
     }, [isClosed])
 
     const blankSelectionOption: GenericObject = blankSelection ? [{ label: blankSelection, value: "" }] : [];
-    const optionsWithBlankSelection = blankSelectionOption.concat(dropdownOptions);
+    const optionsWithBlankSelection = blankSelectionOption.concat(options);
 
     const availableOptions = useMemo(()=> {
         if (!multiSelect) return optionsWithBlankSelection;
@@ -224,21 +203,6 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
                    setFilterItem("");
                    setIsDropDownClosed(true);
                    onSelect && onSelect(clickedItem);
-                   
-                   // Sync with DatePickers if this is a quickpick variant
-                   if (variant === "quickpick" && Array.isArray(clickedItem.value)) {
-                       const [start, end] = clickedItem.value;
-                       
-                       if (controlsStartId) {
-                           const startPicker = (document.querySelector(`#${controlsStartId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
-                           startPicker?.setDate(start, true);
-                       }
-                       
-                       if (controlsEndId) {
-                           const endPicker = (document.querySelector(`#${controlsEndId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
-                           endPicker?.setDate(end, true);
-                       }
-                   }
             }
              };
 
@@ -255,19 +219,6 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
         setSelected({});
         onSelect && onSelect(null);
         setFocusedOptionIndex(-1);
-        
-        // Clear linked DatePickers as well if this is a quickpick variant with controls
-        if (variant === "quickpick") {
-          if (controlsStartId) {
-            const startPicker = (document.querySelector(`#${controlsStartId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
-            startPicker?.clear();
-          }
-          
-          if (controlsEndId) {
-            const endPicker = (document.querySelector(`#${controlsEndId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
-            endPicker?.clear();
-          }
-        }
       }
     };
 
@@ -281,8 +232,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
         dark
     });
 
-    // Create an internal ref object that holds the imperative handle methods
-    const imperativeRef = useRef({
+    useImperativeHandle(ref, () => ({
       clearSelected: () => {
         if (multiSelect) {
           setSelected([]);
@@ -294,61 +244,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
         setFilterItem("");
         setIsDropDownClosed(true);
       },
-    });
-
-    // Update imperativeRef whenever dependencies change
-    // (needed for external clearing of normal Dropdown + DatePicker-synced QuickPick Dropdown)
-    useEffect(() => {
-      imperativeRef.current = {
-        clearSelected: () => {
-          if (multiSelect) {
-            setSelected([]);
-            onSelect && onSelect([]);
-          } else {
-            setSelected({});
-            onSelect && onSelect(null);
-          }
-          setFilterItem("");
-          setIsDropDownClosed(true);
-        },
-      };
-    }, [multiSelect, onSelect, setSelected, setFilterItem, setIsDropDownClosed]);
-
-    useImperativeHandle(ref, () => imperativeRef.current);
-
-    // Create a ref to the outer div to attach the dropdown ref for DatePicker sync
-    const outerDivRef = useRef<HTMLDivElement>(null);
-    
-    useEffect(() => {
-      // Attach the ref to the DOM element so DatePicker can access it
-      if (outerDivRef.current && variant === "quickpick" && id) {
-        (outerDivRef.current as any)._dropdownRef = imperativeRef;
-      }
-    }, [variant, id]);
-
-    // Sync defaultValue with DatePickers on mount when 3 input pattern is used
-    useEffect(() => {
-      if (variant === "quickpick" && initialSelected && typeof initialSelected === "object" && !Array.isArray(initialSelected)) {
-        const value = initialSelected.value;
-        
-        if (Array.isArray(value) && value.length === 2) {
-          const [start, end] = value;
-          
-          // Wait for DatePickers to be initialized
-          setTimeout(() => {
-            if (controlsStartId) {
-              const startPicker = (document.querySelector(`#${controlsStartId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
-              startPicker?.setDate(start, true);
-            }
-            
-            if (controlsEndId) {
-              const endPicker = (document.querySelector(`#${controlsEndId}`) as HTMLElement & { _flatpickr?: any })?._flatpickr;
-              endPicker?.setDate(end, true);
-            }
-          }, 0);
-        }
-      }
-    }, [variant, initialSelected, controlsStartId, controlsEndId]);
+    }));
 
     return (
         <div {...ariaProps}
@@ -356,7 +252,6 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
             {...htmlProps}
             className={classes}
             id={id}
-            ref={outerDivRef}
             style={{position: "relative"}}
         >
             <DropdownContext.Provider

data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_with_custom_active_style_options_react.md

@@ -1,4 +1,4 @@
 The `activeStyle` prop can be used to customize the appearance of the dropdown selection indicator. It accepts an object with the following keys: `backgroundColor` sets the background color of the selected item (and its hover state); `fontColor` sets the font color of the selected item.
 
 `backgroundColor` **Type**: String | **Values**: bg_light | white | **Default**: (no selection) is primary
-`fontColor` **Type**: String | **Values**: primary | all [Playbook Text Colors](https://playbook.powerapp.cloud/global_props/colors) | **Default**: (no selection) is white
+`fontColor` **Type**: String | **Values**: primary | all [Playbook Text Colors](https://playbook.powerapp.cloud/visual_guidelines/colors) | **Default**: (no selection) is white

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

@@ -49,9 +49,4 @@ examples:
   - dropdown_clear_selection: Clear Selection
   - dropdown_separators_hidden: Separators Hidden
   - dropdown_with_external_control: useDropdown Hook
-  - dropdown_quickpick: Quick Pick Variant
-  - dropdown_quickpick_range_end: Quick Pick Variant (Range Ends Today)
-  - dropdown_quickpick_default_dates: Quick Pick Variant (Default Dates)
-  - dropdown_quickpick_with_date_pickers: Quick Pick Variant with Date Pickers
-
 

data/app/pb_kits/playbook/pb_dropdown/docs/index.js

@@ -22,8 +22,4 @@ export { default as DropdownMultiSelectWithDefault } from './_dropdown_multi_sel
 export { default as DropdownMultiSelectWithCustomOptions } from './_dropdown_multi_select_with_custom_options.jsx'
 export {default as DropdownWithCustomIconOptions} from './_dropdown_with_custom_icon_options.jsx'
 export {default as DropdownWithCustomRadioOptions} from './_dropdown_with_custom_radio_options.jsx'
-export {default as DropdownWithCustomActiveStyleOptions} from './_dropdown_with_custom_active_style_options.jsx'
-export { default as DropdownQuickpick } from './_dropdown_quickpick.jsx'
-export { default as DropdownQuickpickRangeEnd } from './_dropdown_quickpick_range_end.jsx'
-export { default as DropdownQuickpickDefaultDates } from './_dropdown_quickpick_default_dates.jsx'
-export { default as DropdownQuickpickWithDatePickers } from './_dropdown_quickpick_with_date_pickers.jsx'
+export {default as DropdownWithCustomActiveStyleOptions} from './_dropdown_with_custom_active_style_options.jsx'