playbook_ui 13.13.0.pre.alpha.play10221678 → 13.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930c0e3d2587afad1b9ea3d50a4a80e37c9c2772ef0a9b12eb6499831bbbcbb5
-  data.tar.gz: 9d8fe14193b9826133a1b47709975b5165aa54b44437feae9aa5eaa244879cfe
+  metadata.gz: '098c0dca78160e891e377c26ed0dff2b5b2528e0676f779c630fe54bed26aed8'
+  data.tar.gz: 4c58eab597c52277785c420a8c9d913d2de6911a57523612df5b52f76105b821
 SHA512:
-  metadata.gz: cd5afb9fe7f8b9b3fcf226049a50ce83df67baddceb0bd22ccbbea5d8db2ec661390be9f7b5e9229da84fcddd4dba909167728b849a9d91215343577b8f9a16e
-  data.tar.gz: 271d69aee52700ec882a56a7f48fe02b6cac9b2d83a3ea3e0c465b75a6dfc501356c0ee080a3f6fb2a178f1697ee05e38c6737c393a0ea73f414037902a9addf
+  metadata.gz: f085821c22ff14c787f4b1d9aa1d12f284d94773b1dafaa2b0b01b815db7cabef337d275d98a78418700eedd20bfa6acf49408d14b619d42a619d19ee6136ee1
+  data.tar.gz: 63e2f1a1aa8b5cef8ca6235ab4999f74995a9c68bfa6e4026a9d797470ab1e9419cc0287967b98fd82c51ce3bfedc53a9029e4ee4aa545e37d071c182215fcd9

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

@@ -13,7 +13,6 @@ type DatePickerProps = {
   allowInput?: boolean,
   aria?: { [key: string]: string },
   className?: string,
-  customQuickPickDates: { override: boolean, dates: any[] },
   dark?: boolean,
   data?: { [key: string]: string },
   defaultDate?: string,
@@ -57,7 +56,6 @@ const DatePicker = (props: DatePickerProps): React.ReactElement => {
     allowInput = false,
     aria = {},
     className,
-    customQuickPickDates,
     dark = false,
     data = {},
     defaultDate = '',
@@ -106,7 +104,6 @@ const DatePicker = (props: DatePickerProps): React.ReactElement => {
 useEffect(() => {
   datePickerHelper({
     allowInput,
-    customQuickPickDates,
     defaultDate,
     disableDate,
     disableRange,

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

@@ -5,8 +5,6 @@ module Playbook
     class DatePicker < Playbook::KitBase
       prop :allow_input, type: Playbook::Props::Boolean,
                          default: false
-      prop :custom_quick_pick_dates, type: Playbook::Props::HashProp,
-                                     default: {}
       prop :dark, type: Playbook::Props::Boolean,
                   default: false
       prop :default_date, type: Playbook::Props::String,
@@ -81,7 +79,6 @@ module Playbook
       def date_picker_config
         {
           allowInput: allow_input,
-          customQuickPickDates: custom_quick_pick_dates,
           defaultDate: default_date,
           disableDate: disable_date,
           disableRange: disable_range,

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

@@ -11,7 +11,6 @@ const getPositionElement = (element: string | Element) => {
 
 type DatePickerConfig = {
   closeOnSelect?: boolean,
-  customQuickPickDates: { override: boolean, dates: any[] },
   disableDate?: number[],
   disableRange?: number[],
   disableWeekdays?: number[],
@@ -35,7 +34,6 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
   const {
     allowInput,
     closeOnSelect = true,
-    customQuickPickDates = { override: true, dates: [] },
     defaultDate,
     disableDate,
     disableRange,
@@ -123,26 +121,27 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
     }
   }
 
-  const setPlugins = (thisRangesEndToday: boolean, customQuickPickDates: any) => {
+  const setPlugins = (thisRangesEndToday: boolean) => {
     const 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, customQuickPickDates))
+    //------- QUICKPICK VARIANT PLUGIN -------------//
+    pluginList.push(quickPickPlugin(thisRangesEndToday))
     }
-  
+
     // time selection
     if (enableTime) pluginList.push(timeSelectPlugin({ caption: timeCaption, showTimezone: showTimezone}))
-  
+
+
     return pluginList
   }
-  
+
   const getDateFormat = () => {
     return enableTime ? `${format} ${timeFormat}` : format
   }
@@ -182,7 +181,7 @@ const datePickerHelper = (config: DatePickerConfig, scrollContainer: string | HT
     onYearChange: [() => {
       yearChangeHook()
     }],
-    plugins: setPlugins(thisRangesEndToday, customQuickPickDates),
+    plugins: setPlugins(thisRangesEndToday),
     position,
     positionElement: getPositionElement(positionElement),
     prevArrow: '<i class="far fa-angle-left"></i>',

data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_quick_pick_react.jsx

@@ -1,5 +1,5 @@
-import React from "react"
-import DatePicker from "../_date_picker"
+import React from 'react'
+import DatePicker from '../_date_picker'
 
 const DatePickerQuickPickReact = (props) => (
   <>

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

@@ -10,8 +10,6 @@ examples:
   - date_picker_range: Range
   - date_picker_quick_pick_rails: Range (Quick Pick)
   - date_picker_quick_pick_range_limit: Range (Quick Pick w/ “This” Range limit)
-  - date_picker_quick_pick_custom: Custom Quick Pick Dates
-  - date_picker_quick_pick_custom_override: Custom Quick Pick Dates (append to defaults)
   - date_picker_format: Format
   - date_picker_disabled: Disabled Dates
   - date_picker_min_max: Min Max
@@ -39,8 +37,6 @@ examples:
   - date_picker_range: Range
   - date_picker_quick_pick_react: Range (Quick Pick)
   - date_picker_quick_pick_range_limit: Range (Quick Pick w/ “This” Range limit)
-  - date_picker_quick_pick_custom: Custom Quick Pick Dates
-  - date_picker_quick_pick_custom_override: Custom Quick Pick Dates (append to defaults)
   - 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

@@ -22,5 +22,3 @@ export { default as DatePickerAllowInput } from './_date_picker_allow_input'
 export { default as DatePickerQuickPickReact } from './_date_picker_quick_pick_react'
 export { default as DatePickerQuickPickRangeLimit } from './_date_picker_quick_pick_range_limit'
 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'

data/app/pb_kits/playbook/pb_date_picker/plugins/quickPick.tsx

@@ -19,14 +19,9 @@ type pluginDataType = {
   rangesButtons: [] | any,
 }
 
-type customQuickPickDatesType = {
-  override: boolean,
-  dates: { label: string, value: string[] | { timePeriod: string, amount: number } }[],
-}
-
 let activeLabel = ""
 
-const quickPickPlugin = (thisRangesEndToday: boolean, customQuickPickDates: customQuickPickDatesType | undefined) => {
+const quickPickPlugin = (thisRangesEndToday: boolean) => {
   return function (fp: FpTypes & any): any {
     const today = new Date()
     const yesterday = DateTime.getYesterdayDate(new Date())
@@ -51,38 +46,8 @@ const quickPickPlugin = (thisRangesEndToday: boolean, customQuickPickDates: cust
     const lastYearStartDate = DateTime.getPreviousYearStartDate(new Date())
     const lastYearEndDate = DateTime.getPreviousYearEndDate(new Date())
 
-    const calculateDateRange = (timePeriod: string, amount: number): Date[] => {
-      const endDate = new Date();
-      let startDate = new Date();
-    
-      switch (timePeriod) {
-        case 'days':
-          startDate.setDate(endDate.getDate() - amount);
-          break;
-        case 'weeks':
-          startDate.setDate(endDate.getDate() - (amount * 7));
-          break;
-        case 'months':
-          startDate.setMonth(endDate.getMonth() - amount);
-          break;
-        case 'quarters':
-          startDate.setMonth(endDate.getMonth() - (amount * 3));
-          break;
-        case 'years':
-          startDate.setFullYear(endDate.getFullYear() - amount);
-          break;
-        default:
-          throw new Error('Invalid time period');
-      }
-      return [startDate, endDate];
-    };
-  
-
-    type rangesType = {
-      [key: string]: Date[]
-    };
-
-    let ranges: rangesType = {
+    // variable that holds the ranges available
+    const ranges = {
       'Today': [today, today],
       'Yesterday': [yesterday, yesterday],
       'This week': [thisWeekStartDate, thisWeekEndDate],
@@ -93,47 +58,16 @@ const quickPickPlugin = (thisRangesEndToday: boolean, customQuickPickDates: cust
       'Last month': [lastMonthStartDate, lastMonthEndDate],
       'Last quarter': [lastQuarterStartDate, lastQuarterEndDate],
       'Last year': [lastYearStartDate, lastYearEndDate]
-    };
-
-    
-    if (customQuickPickDates && Object.keys(customQuickPickDates).length !== 0) {
-      if (customQuickPickDates.dates.length && customQuickPickDates.override === false) {
-        customQuickPickDates.dates.forEach((item) => {
-          if (Array.isArray(item.value)) {
-            ranges[item.label] = item.value.map((dateStr: string) => new Date(dateStr));
-          } else {
-            ranges[item.label] = calculateDateRange(
-              item.value.timePeriod,
-              item.value.amount
-            )
-          }
-        })
-      } else if(customQuickPickDates.dates.length && customQuickPickDates.override !== false) {
-        ranges = {}
-        customQuickPickDates.dates.forEach((item) => {
-          if (Array.isArray(item.value)) {
-            ranges[item.label] = item.value.map((dateStr: string) => new Date(dateStr));
-          } else {
-            ranges[item.label] = calculateDateRange(
-              item.value.timePeriod,
-              item.value.amount
-            )
-          }
-        })
-      }
     }
 
-
     // creating the ul element for the nav dropdown and giving it classnames
     const rangesNav = document.createElement('ul');
 
-
     // creating the pluginData object that will hold the properties of this plugin
     const pluginData: pluginDataType = {
       ranges: ranges,
       rangesNav: rangesNav,
       rangesButtons: [],
-
     };
 
     /**