playbook_ui 12.26.0.pre.alpha.PLAY603datepickerquickpickinputpresetdropdown822 → 12.26.0.pre.alpha.alphafix810

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ec871b0d40e550ff03309300ad52b01f16d33514827f7f3c170a4e9f5005c3
-  data.tar.gz: f6f1acd3aa9b8d8d5b83284ff3b586568fd4690920b270d9fcc42f5100ee19ad
+  metadata.gz: 271bcae8bfc3bbad66487582748a9c6913456fdbb753930c4ae347592356c968
+  data.tar.gz: 3c1ecdc7a8ef45fb406d13e9c26336a1d4f1c690ecf188ffa629d9dcbb076559
 SHA512:
-  metadata.gz: 393dab762f17d56fcbeb3a54354c0725d6792b767d7598886c0067873b331580ca1c27130e8d20690ba72748ceb0e991e2d583bc528ebbfc1fca4a4953a37aa1
-  data.tar.gz: 10d3689d39a00b3424b809ff83555e3d5a17eda3a78ea6a99ff6f221a9d7b879ed576150a33c75e2d86f309f22336ef3d2aa22b864495cf28cd230b084b17e77
+  metadata.gz: '08ae24ed193cc83d2d58b670103cd21f30198cb2cd399479795a194bc6968452a7e9e04cd8bc25aa27e029545fec02879b72b2810530b0b3d54dbb5dde32442e'
+  data.tar.gz: 295905c940167fae71cfc5e1842441d215db993973f141ac03ee95af119e9a187e83f713204b8a2d8da3a36d349b88be4cd6a85ee94f4ab984a1af35f7cb4542

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

@@ -6,7 +6,6 @@
 @import "./sass_partials/month_and_year_styles";
 @import "./sass_partials/time_selection_styles";
 @import "./sass_partials/input_styles";
-@import "./sass_partials/quick_pick_styles";
 
 [class^=pb_date_picker_kit] {
   .input_wrapper {
@@ -27,32 +26,7 @@
       @include transition_default;
       border-color: $primary;
     }
-    .add-on-card {
-      border-color: $primary;
-    }
-  }
-
-  @media (hover: hover) {
-    &:hover {
-      .add-on-card {
-        cursor: pointer;
-        background-color: rgba($focus_input_light,$opacity_5);
-      }
-    }
-  }
-  .text_input_wrapper_add_on .add-on-icon {
-    color: $text_lt_light
   }
-
-  .text_input_wrapper_add_on .add-on-right .text_input{
-    cursor: pointer;
-  }
-  
-}
-
-
-.pb_popover_reference_wrapper {
-  display: unset !important
 }
 
 .flatpickr-calendar {

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

@@ -30,7 +30,7 @@ type DatePickerProps = {
   inputAria?: { [key: string]: string },
   inputData?: { [key: string]: string },
   inputOnChange?: (e: React.FormEvent<HTMLInputElement>) => void,
-  inputValue?: string,
+  inputValue?: any,
   label?: string,
   maxDate: string,
   minDate: string,
@@ -39,10 +39,9 @@ type DatePickerProps = {
   placeholder?: string,
   positionElement?: HTMLElement | null,
   scrollContainer?: string,
-  selectionType?: "month" | "week"| "quickpick",
+  selectionType?: "month" | "week",
   showTimezone?: boolean,
   staticPosition: boolean,
-  thisRangesEndToday?: boolean,
   timeFormat?: string,
   type?: string,
   yearRange?: number[],
@@ -89,7 +88,6 @@ const DatePicker = (props: DatePickerProps): React.ReactElement => {
     selectionType = '',
     showTimezone = false,
     staticPosition = true,
-    thisRangesEndToday = false,
     yearRange = [1900, 2100],
   } = props
 
@@ -98,47 +96,46 @@ const DatePicker = (props: DatePickerProps): React.ReactElement => {
   const inputAriaProps = buildAriaProps(inputAria)
   const inputDataProps = buildDataProps(inputData)
 
-useEffect(() => {
-  datePickerHelper({
-    allowInput,
-    defaultDate,
-    disableDate,
-    disableRange,
-    disableWeekdays,
-    enableTime,
-    format,
-    hideIcon,
-    inLine,
-    maxDate,
-    minDate,
-    mode,
-    onChange,
-    onClose,
-    pickerId,
-    plugins,
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    position,
-    positionElement,
-    selectionType,
-    showTimezone,
-    staticPosition,
-    thisRangesEndToday,
-    yearRange,
-    required: false,
-  }, scrollContainer)
-})
   const filteredProps = {...props}
   delete filteredProps?.position
 
   const classes = classnames(
     buildCss('pb_date_picker_kit'),
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     //@ts-ignore
     globalProps(filteredProps),
     error ? 'error' : null,
     className
   )
+
+  useEffect(() => {
+    datePickerHelper({
+      allowInput,
+      defaultDate,
+      disableDate,
+      disableRange,
+      disableWeekdays,
+      enableTime,
+      format,
+      hideIcon,
+      inLine,
+      maxDate,
+      minDate,
+      mode,
+      onChange,
+      onClose,
+      pickerId,
+      plugins,
+      // @ts-ignore
+      position,
+      positionElement,
+      selectionType,
+      showTimezone,
+      staticPosition,
+      yearRange,
+      required: false,
+    }, scrollContainer)
+  })
+
   const iconWrapperClass = () => {
     let base = 'cal_icon_wrapper'
     if (dark) {
@@ -153,84 +150,80 @@ useEffect(() => {
     return base
   }
 
-
   return (
     <div
-        {...ariaProps}
-        {...dataProps}
-        className={classes}
-        id={id}
+      {...ariaProps}
+      {...dataProps}
+      className={classes}
+      id={id}
     >
       <div
-          {...inputAriaProps}
-          {...inputDataProps}
-          className="input_wrapper"
-      >
+        {...inputAriaProps}
+        {...inputDataProps}
+        className="input_wrapper">
 
         <Caption
-            className="pb_date_picker_kit_label"
-            text={hideLabel ? null : label}
+          className="pb_date_picker_kit_label"
+          text={hideLabel ? null : label}
         />
-          <>
-            <div className="date_picker_input_wrapper">
-              <input
-                  autoComplete="off"
-                  className="date_picker_input"
-                  disabled={disableInput}
-                  id={pickerId}
-                  name={name}
-                  onChange={inputOnChange}
-                  placeholder={placeholder}
-                  value={inputValue}
-              />
 
-              {error &&
-                  <Body
-                      status="negative"
-                      text={error}
-                      variant={null}
-                  />
-              }
-            </div>
+        <div className="date_picker_input_wrapper">
+          <input
+            autoComplete="off"
+            className="date_picker_input"
+            disabled={disableInput}
+            id={pickerId}
+            name={name}
+            onChange={inputOnChange}
+            placeholder={placeholder}
+            value={inputValue}
+          />
+
+          {error && <Body
+            status="negative"
+            text={error}
+            variant={null}
+          />
+          }
+        </div>
 
-            {!hideIcon &&
-              <div
-                  className={iconWrapperClass()}
-                  id={`cal-icon-${pickerId}`}
-              >
-                <Icon
-                    className="cal_icon"
-                    icon="calendar-alt"
-                />
-              </div>
-            }
-
-            {hideIcon && inLine ?
-              <div>
-                <div
-                    className={iconWrapperClass()}
-                    id={`${pickerId}-icon-plus`}
-                >
-                  <Icon
-                      className="date-picker-plus-icon"
-                      icon="plus"
-                  />
-                </div>
-                <div
-                    className={iconWrapperClass()}
-                    id={`${pickerId}-angle-down`}
-                >
-                  <Icon
-                      className="angle_down_icon"
-                      icon="angle-down"
-                  />
-                </div>
-              </div>
-              : null
-            }
-          </>
+        {!hideIcon &&
+          <div
+            className={iconWrapperClass()}
+            id={`cal-icon-${pickerId}`}
+          >
+            <Icon
+              className="cal_icon"
+              icon="calendar-alt"
+            />
+          </div>
+        }
+
+        {hideIcon && inLine ?
+          <div>
+            <div
+              className={iconWrapperClass()}
+              id={`${pickerId}-icon-plus`}
+            >
+              <Icon
+                className="date-picker-plus-icon"
+                icon="plus"
+              />
+            </div>
+            <div
+              className={iconWrapperClass()}
+              id={`${pickerId}-angle-down`}
+            >
+              <Icon
+                className="angle_down_icon"
+                icon="angle-down"
+              />
+            </div>
+          </div>
+          : null}
       </div>
     </div>
   )
 }
+
 export default DatePicker

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

@@ -21,12 +21,6 @@
         required: object.required,
       }) %>
     <% end %>
-
-    <% if object.selection_type == "quickpick" %>
-      <input type="hidden" id="<%= "#{object.start_date}-#{object.picker_id}" %>" name="<%= "#{object.start_date}-#{object.picker_id}" %>">
-      <input type="hidden" id="<%= "#{object.end_date}-#{object.picker_id}" %>" name="<%= "#{object.end_date}-#{object.picker_id}" %>">
-    <% end %>
-
     <% if !object.hide_icon %>
       <div
           class="<%= object.icon_wrapper_class %>"
@@ -67,17 +61,7 @@
 
   <%= javascript_tag do %>
     window.addEventListener("DOMContentLoaded", () => {
-      datePickerHelper(<%= object.date_picker_config %>, "<%= object.scroll_container %>")
-
-      if (<%= object.selection_type == "quickpick" %>) {
-        document.getElementById("<%= object.picker_id %>").addEventListener("change", ({ target }) => {
-          const startDate = document.getElementById("<%= object.start_date %>-<%= object.picker_id %>")
-          const endDate = document.getElementById("<%= object.end_date %>-<%= object.picker_id %>")
-          const splittedValue = target.value.split(" → ")
-          startDate.value = splittedValue[0]
-          endDate.value = splittedValue[1] ? splittedValue[1] : splittedValue[0]
-        })
-      }
+        datePickerHelper(<%= object.date_picker_config %>, "<%= object.scroll_container %>")
     })
   <% end %>
-<% end %>
+<% end %>

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

@@ -19,8 +19,6 @@ module Playbook
                               default: []
       prop :enable_time, type: Playbook::Props::Boolean,
                          default: false
-      prop :end_date, type: Playbook::Props::String,
-                      default: "endDate"
       prop :error, type: Playbook::Props::String
       prop :format, type: Playbook::Props::String,
                     default: "m/d/Y"
@@ -45,24 +43,20 @@ module Playbook
                        required: true
       prop :placeholder, type: Playbook::Props::String,
                          default: "Select Date"
-      prop :plugins,  type: Playbook::Props::Boolean,
-                      default: false,
-                      deprecated: true
+      prop :plugins, type: Playbook::Props::Boolean,
+                     default: false,
+                     deprecated: true
       prop :position, type: Playbook::Props::String,
                       default: "auto"
       prop :position_element, type: Playbook::Props::String
       prop :scroll_container, type: Playbook::Props::String
       prop :selection_type, type: Playbook::Props::Enum,
-                            values: %w[week month quickpick none],
+                            values: %w[week month none],
                             default: "none"
       prop :show_timezone, type: Playbook::Props::Boolean,
                            default: false
-      prop :start_date, type: Playbook::Props::String,
-                        default: "startDate"
       prop :static_position, type: Playbook::Props::Boolean,
                              default: true
-      prop :this_ranges_end_today, type: Playbook::Props::Boolean,
-                                   default: false
       prop :required, type: Playbook::Props::Boolean,
                       default: false
       prop :year_range, type: Playbook::Props::Array,
@@ -94,7 +88,6 @@ module Playbook
           selectionType: selection_type,
           showTimezone: show_timezone,
           staticPosition: static_position,
-          thisRangesEndToday: this_ranges_end_today,
           yearRange: year_range,
         }.to_json.html_safe
       end

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

@@ -1,6 +1,5 @@
 /* eslint-disable no-console */
 import React from 'react'
-import moment from 'moment'
 import { fireEvent, render, screen, waitFor, within } from '../utilities/test-utils'
 
 import DatePicker from './_date_picker'
@@ -11,6 +10,7 @@ import { getTimezoneText } from './plugins/timeSelect'
 jest.setSystemTime(new Date('01/01/2020'));
 const DEFAULT_DATE = new Date()
 
+
 describe('DatePicker Kit', () => {
   beforeEach(() => {
     jest.spyOn(console, 'error').mockImplementation(() => { });
@@ -158,87 +158,4 @@ describe('DatePicker Kit', () => {
       expect(input).toHaveValue('01/01/2020 at 12:00 PM')
     })
   })
-  test('shows DatePicker QuickPick dropdown and adds correct date to input', async () => {
-    const testId = 'datepicker-quick-pick'
-    render(
-      <DatePicker
-          allowInput
-          data={{ testid: testId }}
-          mode="range"
-          pickerId="date-picker-quick-pick"
-          placeholder="mm/dd/yyyy → mm/dd/yyyy"
-          selectionType="quickpick"
-      />
-    )
-
-    const kit = screen.getByTestId(testId)
-    const input = within(kit).getByPlaceholderText('mm/dd/yyyy → mm/dd/yyyy')
-
-    fireEvent(
-      input,
-      new MouseEvent('click', {
-        bubbles: true,
-        cancelable: true,
-      }),
-    )
-    const today = within(kit).getByText('Today')
-    const thisYear = within(kit).getByText('This year')
-    await waitFor(() => {
-      expect(today).toBeInTheDocument()
-      expect(thisYear).toBeInTheDocument()
-    })
-
-    fireEvent(
-      thisYear,
-      new MouseEvent('click', {
-        bubbles: true,
-        cancelable: true,
-      }),
-    )
-
-    await waitFor(() => {
-      expect(input).toHaveValue(moment().startOf('year').format('MM/DD/YYYY') + " → " + moment().endOf('year').format('MM/DD/YYYY'))
-    })
-
-  })
-  test('shows DatePicker QuickPick ranges ending today', async () => {
-    const testId = 'datepicker-quick-pick-ends-today'
-    render(
-      <DatePicker
-          allowInput
-          data={{ testid: testId }}
-          mode="range"
-          pickerId="date-picker-quick-pick"
-          placeholder="mm/dd/yyyy → mm/dd/yyyy"
-          selectionType="quickpick"
-          thisRangesEndToday
-      />
-    )
-
-    const kit = screen.getByTestId(testId)
-    const input = within(kit).getByPlaceholderText('mm/dd/yyyy → mm/dd/yyyy')
-
-    fireEvent(
-      input,
-      new MouseEvent('click', {
-        bubbles: true,
-        cancelable: true,
-      }),
-    )
-    
-    const thisYear = within(kit).getByText('This year')
-
-    fireEvent(
-      thisYear,
-      new MouseEvent('click', {
-        bubbles: true,
-        cancelable: true,
-      }),
-    )
-
-    await waitFor(() => {
-      expect(input).toHaveValue(moment().startOf('year').format('MM/DD/YYYY') + " → " + moment().format('MM/DD/YYYY'))
-    })
-
-  })
 })

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

@@ -3,7 +3,6 @@ import { BaseOptions } from 'flatpickr/dist/types/options'
 import monthSelectPlugin from 'flatpickr/dist/plugins/monthSelect'
 import weekSelect from "flatpickr/dist/plugins/weekSelect/weekSelect"
 import timeSelectPlugin from './plugins/timeSelect'
-import quickPickPlugin from './plugins/quickPick'
 
 const getPositionElement = (element: string | Element) => {
   return (typeof element === 'string') ? document.querySelectorAll(element)[0] : element
@@ -20,11 +19,10 @@ type DatePickerConfig = {
   hideIcon?: boolean;
   inLine?: boolean,
   onChange: (dateStr: string, selectedDates: Date[]) => void,
-  selectionType?: "month" | "week" | "quickpick" | "",
   onClose: (dateStr: Date[] | string, selectedDates: Date[] | string) => void,
+  selectionType?: "month" | "week" | "",
   showTimezone?: boolean,
   staticPosition: boolean,
-  thisRangesEndToday?: boolean,
   timeCaption?: string,
   timeFormat?: string,
   yearRange: number[]
@@ -53,7 +51,6 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
     selectionType,
     showTimezone,
     staticPosition = true,
-    thisRangesEndToday = false,
     timeCaption = 'Select Time',
     timeFormat = 'at h:i K',
     yearRange,
@@ -92,24 +89,19 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
     }
   }
 
-  const setPlugins = (thisRangesEndToday: boolean) => {
-    const pluginList = []
+  const setPlugins = () => {
+    let pluginList = []
 
     // month and week selection
     if (selectionType === "month" || plugins.length > 0) {
       pluginList.push(monthSelectPlugin({ shorthand: true, dateFormat: 'F Y', altFormat: 'F Y' }))
     } else if ( selectionType === "week") {
       pluginList.push(weekSelect())
-
-    } else if (selectionType === "quickpick") {
-    //------- QUICKPICK VARIANT PLUGIN -------------//
-    pluginList.push(quickPickPlugin(thisRangesEndToday))
     }
 
     // time selection
     if (enableTime) pluginList.push(timeSelectPlugin({ caption: timeCaption, showTimezone: showTimezone}))
 
-
     return pluginList
   }
 
@@ -152,9 +144,6 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
       },
     ] : disabledParser(),
     enableTime,
-    locale: {
-      rangeSeparator: ' → '
-    },
     maxDate,
     minDate,
     mode,
@@ -175,40 +164,17 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
     onYearChange: [() => {
       yearChangeHook()
     }],
-    plugins: setPlugins(thisRangesEndToday),
+    plugins: setPlugins(),
     position,
     positionElement: getPositionElement(positionElement),
     prevArrow: '<i class="far fa-angle-left"></i>',
     static: staticPosition,
   })
 
-
   // ===========================================================
   //                 Additional JS Functionality               |
   // ===========================================================
 
-  // opens flatpickr instance when calander icon is clicked so we can have a hover state on icon
-  // window.addEventListener("DOMContentLoaded", (event) => {
-  //   event.preventDefault();
-  //   function attachIconClickHandler() {
-  //     const variantArr = document.querySelectorAll(`#cal-icon-${pickerId}`)
-  //     if (!variantArr) {
-  //       setTimeout(attachIconClickHandler, 100);
-  //       return;
-  //     }
-
-  //     const instance = document.querySelector<HTMLElement & { [x: string]: any }>(`#${pickerId}`)._flatpickr
-  //     variantArr.forEach((icon) => {
-  //       icon.addEventListener("click", function(event) {
-  //         event.preventDefault();
-  //         instance.open()
-  //       });
-  //     })
-  //   }
-
-  //   attachIconClickHandler();
-  // });
-
   // Assign dynamically sourced flatpickr instance to variable
   const picker = document.querySelector<HTMLElement & { [x: string]: any }>(`#${pickerId}`)._flatpickr
   picker.innerContainer.parentElement.id = `cal-${pickerId}`

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

@@ -8,7 +8,6 @@ examples:
   - date_picker_input: Input Field
   - date_picker_label: Label
   - date_picker_range: Range
-  - date_picker_quick_pick: Range (Quick Pick)
   - date_picker_format: Format
   - date_picker_disabled: Disabled Dates
   - date_picker_min_max: Min Max
@@ -34,7 +33,6 @@ examples:
   - date_picker_on_change: onChange
   - date_picker_on_close: onClose
   - date_picker_range: Range
-  - date_picker_quick_pick: Range (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

@@ -19,5 +19,4 @@ export { default as DatePickerWeek } from './_date_picker_week.jsx'
 export { default as DatePickerPositions } from './_date_picker_positions.jsx'
 export { default as DatePickerPositionsElement } from './_date_picker_positions_element.jsx'
 export { default as DatePickerAllowInput } from './_date_picker_allow_input'
-export { default as DatePickerQuickPick } from './_date_picker_quick_pick'
-export { default as DatePickerOnClose } from './_date_picker_on_close.jsx'
+export { default as DatePickerOnClose } from './_date_picker_on_close.jsx'

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

@@ -1,4 +1,3 @@
-@import "../../tokens/colors";
 // Calendar Icon Styles
 .cal_icon_wrapper {
   pointer-events: none;
@@ -14,8 +13,8 @@
   padding-left: $space_sm - 1;
   color: $text_lt_light;
   @media (hover: hover) {
-    &:hover{
-      background-color: rgba($focus_input_light,$opacity_5);
+    &:hover {
+      cursor: pointer;
     }
   }
   &.dark {

data/app/pb_kits/playbook/pb_nav/_item.tsx

@@ -87,7 +87,7 @@ const NavItem = (props: NavItemProps) => {
         <span className="pb_nav_list_item_text">
           {text || children}
         </span>
-
+        
         {iconRight &&
           <div
             className="pb_nav_list_item_icon_section"

data/app/pb_kits/playbook/pb_nav/_subtle_mixin.scss

@@ -44,7 +44,7 @@
     &[class*=_active] [class*=_link] {
       @include pb_title_4;
       color: $primary;
-      letter-spacing: normal;
+       letter-spacing: normal;
     }
   }
 }