playbook_ui 7.0.1.pre.alpha14 → 7.0.1.pre.alpha15

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

@@ -4,18 +4,22 @@ import { DatePicker } from '../../'
 const DatePickerFormat = () => (
   <div>
     <DatePicker
+        defaultDate={new Date()}
         format="m-d-Y"
         pickerId="date-picker-format1"
     />
     <DatePicker
+        defaultDate={new Date()}
         format="m/d/y"
         pickerId="date-picker-format2"
     />
     <DatePicker
+        defaultDate={new Date()}
         format="n-j-y"
         pickerId="date-picker-format3"
     />
     <DatePicker
+        defaultDate={new Date()}
         format="Y-d-m"
         pickerId="date-picker-format4"
     />

data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_input.html.erb

@@ -1,26 +1,26 @@
 <%= pb_rails("date_picker", props: {
   input_aria: { label: "input-field" },
   input_data: { key: "value", key2: "value2" },
+  label: "Aria, Name, and Data Attributes",
   name: "date-field",
   picker_id: "date-picker-input1",
-  type: "date"
 }) %>
 
 <%= pb_rails("date_picker", props: {
-  default_date: "blank",
+  label: "Custom Placeholder",
   picker_id: "date-picker-input2",
-  placeholder: "Select Date",
+  placeholder: "custom-placeholder",
 }) %>
 
 <%= pb_rails("date_picker", props: {
-  default_date: "blank",
-  disable_input: true,
+  label: "Blank Placeholder",
   picker_id: "date-picker-input3",
-  placeholder: "Disabled Input"
+  placeholder: ""
 }) %>
 
 <%= pb_rails("date_picker", props: {
-  dark: true,
-  hide_label: true,
-  picker_id: "date-picker-input4"
+  disable_input: true,
+  label: "Disable Input",
+  picker_id: "date-picker-input4",
+  placeholder: "Disabled Input"
 }) %>

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

@@ -6,25 +6,25 @@ const DatePickerInput = () => (
     <DatePicker
         inputAria={{ label: 'input-field' }}
         inputData={{ key: 'value', key2: 'value2' }}
+        label="Aria, Name, and Data Attributes"
         name="date-field"
         pickerId="date-picker-input1"
-        type="date"
     />
     <DatePicker
-        defaultDate="blank"
+        label="Custom Placeholder"
         pickerId="date-picker-input2"
-        placeholder="Select Date"
+        placeholder="custom-placeholder"
     />
     <DatePicker
-        defaultDate="blank"
-        disableInput
+        label="Blank Placeholder"
         pickerId="date-picker-input3"
-        placeholder="Disabled Input"
+        placeholder=""
     />
     <DatePicker
-        dark
-        hideLabel
+        disableInput
+        label="Disable Input"
         pickerId="date-picker-input4"
+        placeholder="Disabled Input"
     />
   </div>
 )

data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_input.md

@@ -1,3 +1,5 @@
 The date picker is built with the text input kit.  Text input props you pass to the date picker kit will be forwarded to the input, with a few exceptions.  The `value` attribute is automatically handled and bound to whatever date string is contained by the input field.  You cannot pass a custom value prop.  `id` props passed to the date picker kit will be assigned to it's parent/wrapper div.  The `pickerId` prop is passed directly to the input and is required to instatiate the date picker.
 
-You must use `inputAria` or `input_aria` and `inputData` or `input_data` props if you wish to pass data or aria attributes to the text input kit.  If you use `data` or `aria` props they will be passed to the date picker kit itself instead.  Also be aware the default behavior of text input aria and data props is to pass those props to attributes on the wrapping div not on the input itself.
+You must use `inputAria` or `input_aria` and `inputData` or `input_data` props if you wish to pass data or aria attributes to the text input kit.  If you use `data` or `aria` props they will be passed to the date picker kit itself instead.  Also be aware the default behavior of text input aria and data props is to pass those props to attributes on the wrapping div not on the input itself.
+
+The placeholder prop has a default string value: "Select Date".  You can replace this with your own string or an empty string if you'd prefer it blank.

data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_range.html.erb

@@ -1,4 +1,5 @@
 <%= pb_rails("date_picker", props: {
+  default_date: [(Date.today).httpdate, (Date.today + 7).httpdate],
   mode: "range",
   picker_id: "date-picker-range"
 }) %>

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

@@ -4,6 +4,7 @@ import { DatePicker } from '../../'
 const DatePickerRange = () => (
   <div>
     <DatePicker
+        defaultDate={[new Date(), new Date().fp_incr(6)]}
         mode="range"
         pickerId="date-picker-range"
     />

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

@@ -12,9 +12,7 @@ examples:
   - date_picker_min_max: Min Max
   - date_picker_error: Error
   - date_picker_hooks: Hooks
-  # - date_picker_allow_input: Allow Input
   - date_picker_year_range: Year Range
-  - date_picker_dark: Dark
   
   
   react:
@@ -30,7 +28,5 @@ examples:
   - date_picker_min_max: Min Max
   - date_picker_error: Error
   - date_picker_hooks: Hooks
-  # - date_picker_allow_input: Allow Input
   - date_picker_year_range: Year Range
-  - date_picker_dark: Dark
   

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

@@ -10,6 +10,4 @@ export { default as DatePickerDisabled } from './_date_picker_disabled.jsx'
 export { default as DatePickerMinMax } from './_date_picker_min_max.jsx'
 export { default as DatePickerError } from './_date_picker_error.jsx'
 export { default as DatePickerHooks } from './_date_picker_hooks.jsx'
-// export { default as DatePickerAllowInput } from './_date_picker_allow_input.jsx'
 export { default as DatePickerYearRange } from './_date_picker_year_range.jsx'
-export { default as DatePickerDark } from './_date_picker_dark.jsx'

data/app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.html.erb

@@ -2,21 +2,15 @@
     id: object.id,
     data: object.data,
     class: object.classname) do %>
+    <div class="pb_date_range_inline_wrapper">
+      <% if object.icon == true %>
+        <%= pb_rails(object.text_kit, props: { tag: "span", dark: object.dark, color: object.icon_color, text: pb_rails("icon", props: { icon: "calendar-alt", fixed_width: true, size: object.size, classname: "pb_date_range_inline_icon" }) }) %>
+      <% end %>
 
-    <%= pb_rails("body", props: { tag: "span", color: "light" }) do %>
-      <%= pb_rails("icon", props: { icon: "calendar-alt", fixed_width: true }) %>
-    <% end %>
+      <%= pb_rails(object.text_kit, props: { tag: "span", dark: object.dark, text: object.start_date_display }) %>
 
-    <%= pb_rails("body", props: { tag: "span"}) do %>
-      <%= object.start_date_display %>
-    <% end %>
-
-    <%= pb_rails("body", props: { tag: "span", color: "light" }) do %>
-      <%= pb_rails("icon", props: { icon: "long-arrow-right", fixed_width: true }) %>
-    <% end %>
-
-    <%= pb_rails("body", props: { tag: "span"}) do %>
-      <%= object.end_date_display %>
-    <% end %>
+      <%= pb_rails(object.text_kit, props: { tag: "span", dark: object.dark, color: object.icon_color, text: pb_rails("icon", props: { icon: "long-arrow-right", fixed_width: true, size: object.size, classname: "pb_date_range_inline_arrow"}) }) %>
 
+      <%= pb_rails(object.text_kit, props: { tag: "span", dark: object.dark, text: object.end_date_display }) %>
+    </div>
 <% end %>

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

@@ -2,21 +2,30 @@
 
 import React from 'react'
 import DateTime from '../pb_kit/dateTime.js'
-import { Body, Icon } from '../'
+import { Body, Caption, Icon } from '../'
 import classnames from 'classnames'
 import { globalProps } from '../utilities/globalProps.js'
+import { buildCss } from '../utilities/props'
 
 type DateRangeInlineProps = {
   className?: string,
-  data?: string,
-  endDate?: date,
   id?: string,
+  data?: string,
+  align?: "left" | "center" | "vertical",
+  size?: "sm" | "xs",
+  dark?: boolean,
+  icon?: boolean,
   startDate?: date,
+  endDate?: date
 }
 
-const dateTimestamp = (dateValue) => {
+const dateTimestamp = (dateValue, includeYear) => {
   const date = new DateTime({ value: dateValue })
-  return `${date.toDay()} ${date.toMonth()} ${date.toYear()}`
+  if (includeYear) {
+    return `${date.toMonth()} ${date.toDay()}, ${date.toYear()}`
+  } else {
+    return `${date.toMonth()} ${date.toDay()}`
+  }
 }
 
 const dateTimeIso = (dateValue) => {
@@ -25,41 +34,115 @@ const dateTimeIso = (dateValue) => {
 }
 
 const DateRangeInline = (props: DateRangeInlineProps) => {
-  const { endDate, startDate } = props
+  const {
+    icon = false,
+    dark = false,
+    size = 'sm',
+    align = 'left',
+    startDate,
+    endDate,
+    className,
+  } = props
+
+  const iconContent = () => {
+    return (
+      <If condition={icon}>
+        <Body
+            color="light"
+            tag="span"
+        >
+          <Icon
+              className="pb_date_range_inline_icon"
+              dark={dark}
+              fixedWidth
+              icon="calendar-alt"
+              size={size}
+              tag="span"
+          />
+        </Body>
+      </If>
+    )
+  }
+
+  const dateInCurrentYear = () => {
+    const currentDate = new Date()
+    return startDate.getFullYear() == endDate.getFullYear() && startDate.getFullYear() == currentDate.getFullYear()
+  }
+
+  const dateRangeClasses =  buildCss('pb_date_range_inline_kit', align)
+
+  const renderTime = (date) => {
+    return (
+      <time dateTime={dateTimeIso(date)}>
+        <Choose>
+          <When condition={dateInCurrentYear()}>
+            {` ${dateTimestamp(date, false)} `}
+          </When>
+          <Otherwise>
+            {` ${dateTimestamp(date, true)} `}
+          </Otherwise>
+        </Choose>
+      </time>
+    )
+  }
+
   return (
-    <div className={classnames('pb_date_range_inline', globalProps(props))}>
-      <Body
-          color="light"
-          tag="span"
-      >
-        <Icon
-            fixedWidth
-            icon="calendar-alt"
-        />
-      </Body>
-      <Body tag="span">
-        <time dateTime={dateTimeIso(startDate)}>
-          {` ${dateTimestamp(
-          startDate
-        )} `}
-        </time>
-      </Body>
-      <Body
-          color="light"
-          tag="span"
-      >
-        <Icon
-            fixedWidth
-            icon="long-arrow-right"
-        />
-      </Body>
-      <Body tag="span">
-        <time dateTime={dateTimeIso(endDate)}>
-          {` ${dateTimestamp(
-          endDate
-        )} `}
-        </time>
-      </Body>
+    <div className={classnames(dateRangeClasses, globalProps(props), className)}>
+      <div className="pb_date_range_inline_wrapper">
+        <If condition={size == 'xs'}>
+          {iconContent()}
+          <Caption
+              dark={dark}
+              tag="span"
+          >
+            {renderTime(startDate)}
+          </Caption>
+          <Caption
+              dark={dark}
+              tag="span"
+          >
+            <Icon
+                className="pb_date_range_inline_arrow"
+                fixedWidth
+                icon="long-arrow-right"
+            />
+          </Caption>
+          <Caption
+              dark={dark}
+              tag="span"
+          >
+            {renderTime(endDate)}
+          </Caption>
+        </If>
+
+        <If condition={size == 'sm'}>
+          {iconContent()}
+          <Body
+              dark={dark}
+              tag="span"
+          >
+            {renderTime(startDate)}
+          </Body>
+          <Body
+              color="light"
+              dark={dark}
+              tag="span"
+          >
+            <Icon
+                className="pb_date_range_inline_arrow"
+                dark={dark}
+                fixedWidth
+                icon="long-arrow-right"
+            />
+          </Body>
+          <Body
+              dark={dark}
+              tag="span"
+          >
+            {renderTime(endDate)}
+          </Body>
+        </If>
+      </div>
     </div>
   )
 }

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

@@ -1,3 +1,34 @@
-.pb_date_range_inline {
-
+[class^=pb_date_range_inline_kit] {
+  &[class*=_center]  {
+    & > [class^=pb_caption],
+    & > [class^=pb_body] {
+      text-align: center;
+    }
+    & > [class*=pb_date_range_inline_wrapper] {
+      justify-content: center;
+    }
+  }
+  &[class*=_right] {
+    & > [class^=pb_caption],
+    & > [class^=pb_body] {
+      text-align: right;
+    }
+    & > [class*=pb_date_range_inline_wrapper] {
+      justify-content: flex-end;
+    }
+  }
+  [class^=pb_date_range_inline_wrapper] {
+    display: flex;
+    align-items: center;
+    [class*=pb_date_range_inline_arrow] {
+      margin-left: $space_xs/2;
+      margin-right: $space_xs/2;
+    }
+    [class*=pb_date_range_inline_timezone] {
+      margin-left: $space_xs/2;
+    }
+    [class*=pb_date_range_inline_icon] {
+      margin-right: $space_xs/2;
+    }
+  }
 }

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

@@ -11,24 +11,59 @@ module Playbook
 
       prop :end_date, type: Playbook::Props::Date, required: true
       prop :start_date, type: Playbook::Props::Date, required: true
+      prop :icon, required: false
+      prop :dark, type: Playbook::Props::Boolean,
+                  default: false
+      prop :size, type: Playbook::Props::Enum,
+                  values: %w[xs sm],
+                  default: "sm"
+      prop :align, type: Playbook::Props::Enum,
+                   values: %w[left center right],
+                   default: "left"
 
       def classname
-        generate_classname("pb_date_range_inline_kit")
+        generate_classname("pb_date_range_inline_kit", dark_class, align)
       end
 
-      def end_date_display
-        date_time = Playbook::PbKit::PbDateTime.new(end_date)
-        content_tag(:time, datetime: date_time.to_iso) do
-          "#{date_time.to_day} #{date_time.to_month_downcase} #{date_time.to_year}"
+      def text_kit
+        case size
+        when "xs"
+          "caption"
+        when "sm"
+          "body"
         end
       end
 
-      def start_date_display
-        date_time = Playbook::PbKit::PbDateTime.new(start_date)
-        content_tag(:time, datetime: date_time.to_iso) do
-          "#{date_time.to_day} #{date_time.to_month_downcase} #{date_time.to_year}"
+      def icon_color
+        size == "sm" ? "light" : nil
+      end
+
+      def dates_in_current_year?
+        current_year = Time.current.year
+        start_date.year == current_year && end_date.year == current_year
+      end
+
+      def time_display(time)
+        content_tag(:time, datetime: time.to_iso) do
+          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
+
+      def end_date_display
+        time_display(Playbook::PbKit::PbDateTime.new(end_date))
+      end
+
+      def start_date_display
+        time_display(Playbook::PbKit::PbDateTime.new(start_date))
+      end
+
+      def dark_class
+        dark ? "dark" : nil
+      end
     end
   end
 end