RubyGems - playbook_ui - Versions diffs - 8.0.0.pre.alpha5 → 8.1.0.pre.alpha1 - Mend

playbook_ui 8.0.0.pre.alpha5 → 8.1.0.pre.alpha1

Files changed (159) hide show

data/app/pb_kits/playbook/pb_time_stacked/_time_stacked.jsx CHANGED Viewed

@@ -4,50 +4,67 @@ import React from 'react'
 import classnames from 'classnames'
 import DateTime from '../pb_kit/dateTime.js'
-import { buildCss } from '../utilities/props'
-import { Body, Caption } from '../'
+import { buildCss, buildDataProps } from '../utilities/props'
 import { deprecatedProps, globalProps } from '../utilities/globalProps.js'
+import { Body, Caption } from '../'
 type TimeStackedProps = {
   align?: 'left' | 'center' | 'right',
   className?: string | array<string>,
   dark?: boolean,
-  data?: string,
-  date: string,
+  data?: object,
+  date?: string,
   id?: string,
-  tag?: 'body' | 'caption',
+  time: number | Date,
+  timeZone?: string,
 }
-const TimeStacked = (props: TimeStackedProps) => {
-  const { align, className, dark, date } = props
-  deprecatedProps('TimeStacked', ['tag'])
+const TimeStackedDefault = (props: TimeStackedProps) => {
+  if (props.date) deprecatedProps('Time Stacked', ['date']) //date prop is deprecated, use time instead
+  const {
+    align = 'left',
+    className,
+    dark,
+    data = {},
+    date,
+    time,
+    timeZone,
+  } = props
   const classes = classnames(
     buildCss('pb_time_stacked_kit', align),
     globalProps(props),
-    className,
+    className
   )
+  const dataProps = buildDataProps(data)
-  const dateTimestamp = new DateTime({ value: date })
+  const dateTimestamp = new DateTime({ value: date ? date : new Date(time), zone: timeZone })
   return (
-    <div className={classes}>
-      <div
-          align={align}
-          className="pb_time_stacked_day_month"
+    <div
+        className={classes}
+        {...dataProps}
+    >
+      <Body
+          className={classnames('pb_time_stacked', 'time-spacing')}
+          color="light"
+          dark={dark}
       >
-        <Body
-            color="light"
-            dark={dark}
-            text={dateTimestamp.toTimeWithMeridian()}
-        />
-        <Caption
-            color="light"
-            dark={dark}
-            text={dateTimestamp.toTimezone()}
-        />
-      </div>
+        <time>
+          {dateTimestamp.toTimeWithMeridian()}
+          <Caption
+              className="pb_time_stacked"
+              color="light"
+              dark={dark}
+              tag="span"
+              text={dateTimestamp.toTimezone()}
+          />
+        </time>
+      </Body>
     </div>
   )
 }
-export default TimeStacked
+export default TimeStackedDefault

data/app/pb_kits/playbook/pb_time_stacked/_time_stacked.scss CHANGED Viewed

@@ -1,3 +1,21 @@
 @import "../pb_title/title";
 @import "../pb_caption/caption";
 @import "../tokens/colors";
+[class^=pb_time_stacked_kit] {
+ &[class*=_center]  {
+   text-align: center;
+ }
+ &[class*=_right]  {
+   text-align: right;
+ }
+}
+.time-spacing {
+  time {
+    display: inline-grid;
+    margin-bottom: $space_xs - 6px;
+  }
+}

data/app/pb_kits/playbook/pb_time_stacked/docs/_time_stacked_default.html.erb CHANGED Viewed

@@ -1,5 +1,18 @@
-<%= pb_rails("time_stacked", props: { date: DateTime.now }) %>
-<br/>
-<%= pb_rails("time_stacked", props: { align: "center", date: DateTime.now }) %>
-<br/>
-<%= pb_rails("time_stacked", props: { align: "right", date: DateTime.now }) %>
+<%= pb_rails("time_stacked", props: {
+  time: DateTime.now,
+  align: "left",
+}) %>
+<br>
+<%= pb_rails("time_stacked", props: {
+  time: Time.now,
+  align: "center"
+}) %>
+<br>
+<%= pb_rails("time_stacked", props: {
+  time: Time.now,
+  align: "right"
+}) %>

data/app/pb_kits/playbook/pb_time_stacked/docs/_time_stacked_default.jsx CHANGED Viewed

@@ -5,18 +5,23 @@ const TimeStackedDefault = (props) => {
   return (
     <div>
       <TimeStacked
+          time={new Date()}
+          timeZone="America/New_York"
           {...props}
-          date={new Date()}
       />
+      <br />
       <TimeStacked
-          {...props}
           align="center"
-          date={new Date()}
+          time={new Date()}
+          timeZone="America/New_York"
+          {...props}
       />
+      <br />
       <TimeStacked
-          {...props}
           align="right"
-          date={new Date()}
+          time={new Date()}
+          timeZone="America/New_York"
+          {...props}
       />
     </div>
   )

data/app/pb_kits/playbook/pb_time_stacked/time_stacked.html.erb CHANGED Viewed

@@ -1,8 +1,12 @@
 <%= content_tag(:div,
-    align: object.align,
     id: object.id,
     data: object.data,
     class: object.classname) do %>
-      <%= pb_rails("body", props: { text: object.format_time_string, color: "light" }) %>
-      <%= pb_rails("caption", props: { text: object.format_timezone, color: "light" }) %>
+    <%= pb_rails("body", props: { color: "light", classname: "pb_time_stacked time-spacing" }) do %>
+      <time>
+        <%= object.format_time_string %>
+        <%= pb_rails("caption", props: { color: "light", tag: "span", text: object.pb_date_time.to_timezone.upcase, classname: "pb_time_stacked" }) %>
+      </time>
+    <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_time_stacked/time_stacked.rb CHANGED Viewed

@@ -3,49 +3,27 @@
 module Playbook
   module PbTimeStacked
     class TimeStacked < Playbook::KitBase
+      prop :time, required: true
       prop :align, type: Playbook::Props::Enum,
                    values: %w[left center right],
                    default: "left"
-      prop :classnames, type: Playbook::Props::String,
-                        default: nil
-      prop :dark, type: Playbook::Props::Boolean,
-                  default: false
-      prop :date, type: Playbook::Props::Date, required: true
+      prop :timezone, default: "America/New_York"
       def classname
-        generate_classname("pb_time_stacked_kit", dark_class)
-      end
-      def day
-        day = Playbook::PbKit::PbDateTime.new(date)
-        content_tag(:time, datetime: day.to_iso) do
-          day.to_day.to_s
-        end
-      end
-      def month
-        month = Playbook::PbKit::PbDateTime.new(date)
-        content_tag(:time, datetime: month.to_iso) do
-          month.to_month.to_s
-        end
+        # convert deprecated prop values
+        generate_classname("pb_time_stacked_kit", align)
       end
       def format_time_string
-        "#{pb_date_time.to_full_hour}:#{pb_date_time.to_minutes}#{pb_date_time.to_meridian}"
+        "#{pb_date_time.to_hour}:#{pb_date_time.to_minutes}#{pb_date_time.to_meridian}"
       end
-      def format_timezone
-        pb_date_time.to_timezone
-      end
-    private
-      def dark_class
-        dark ? "dark" : nil
+      def format_timezone_string
+        pb_date_time.to_timezone.to_s
       end
       def pb_date_time
-        Playbook::PbKit::PbDateTime.new(date)
+        Playbook::PbKit::PbDateTime.new(time, timezone)
       end
     end
   end

data/app/pb_kits/playbook/pb_time_stacked/time_stacked.test.js ADDED Viewed

@@ -0,0 +1,33 @@
+import { renderKit, screen } from '../utilities/test-utils'
+import TimeStacked from './_time_stacked'
+/*eslint no-multiple-empty-lines: 0*/
+test('returns the namespaced class', () => {
+  const props = {
+    data: { testid: 'default' },
+    time: new Date,
+  }
+  renderKit(TimeStacked, props)
+  expect(screen.getByTestId('default')).toHaveClass('pb_time_stacked_kit_left')
+  renderKit(TimeStacked, props, {
+    align: 'center',
+    data: { testid: 'center' },
+  })
+  expect(screen.getByTestId('center')).toHaveClass('pb_time_stacked_kit_center')
+  renderKit(TimeStacked, props, {
+    align: 'right',
+    data: { testid: 'right' },
+  })
+  expect(screen.getByTestId('right')).toHaveClass('pb_time_stacked_kit_right')
+  renderKit(TimeStacked, props, {
+    dark: true,
+    data: { testid: 'dark' },
+  })
+  expect(screen.getByTestId('dark')).toHaveClass('pb_time_stacked_kit_left dark')
+})

data/app/pb_kits/playbook/pb_tooltip/_tooltip.scss CHANGED Viewed

@@ -46,7 +46,7 @@ $tooltip_shadow: rgba(60, 106, 172, 0.18);
       content: " ";
       position: absolute;
       top: 100%;
-      left: 50%;
+      left: calc(50% - 10px);
       border-color: $white transparent transparent transparent;
       border-style: solid;
       border-width: 10px;
@@ -95,9 +95,10 @@ $tooltip_shadow: rgba(60, 106, 172, 0.18);
     box-shadow: -8px 0 28px 0 $tooltip_shadow;
     margin: 0 0 0 $space_sm;
     .arrow {
-      left: -#{$space_xs};
-      top: $arrow_vertical_offset;
+      left: -18px;
+      right: auto;
       margin-bottom: 0;
+      top: $arrow_vertical_offset;
       transform: rotate(90deg);
     }
     &.flipped .arrow {

data/app/pb_kits/playbook/pb_typeahead/_typeahead.jsx CHANGED Viewed

@@ -3,6 +3,7 @@
 import React from 'react'
 import Select from 'react-select'
 import AsyncSelect from 'react-select/async'
+import CreateableSelect from 'react-select/creatable'
 import { get } from 'lodash'
 import { globalProps } from '../utilities/globalProps.js'
@@ -26,6 +27,7 @@ import { noop } from '../utilities/props'
 type Props = {
   async?: boolean,
+  createable?: boolean,
   dark?: boolean,
   label?: string,
   loadOptions?: noop | string,
@@ -41,6 +43,7 @@ type Props = {
 const Typeahead = (props: Props) => {
   const selectProps = {
+    badges: false,
     cacheOptions: true,
     components: {
       Control,
@@ -58,6 +61,7 @@ const Typeahead = (props: Props) => {
     isClearable: true,
     isSearchable: true,
     name,
+    onCreate: () => {},
     ...props,
   }
@@ -65,7 +69,8 @@ const Typeahead = (props: Props) => {
   if (typeof(props.getOptionLabel) === 'string') selectProps.getOptionLabel = get(window, props.getOptionLabel)
   if (typeof(props.getOptionValue) === 'string') selectProps.getOptionValue = get(window, props.getOptionValue)
-  const Tag = props.async ? AsyncSelect : Select
+  let Tag = props.async ? AsyncSelect : Select
+  if (props.createable) Tag = CreateableSelect
   const handleOnChange = (data, { action, option, removedValue }) => {
     if (action === 'select-option') {

data/app/pb_kits/playbook/pb_typeahead/components/MultiValue.jsx CHANGED Viewed

@@ -3,7 +3,7 @@
 import React from 'react'
 import { components } from 'react-select'
-import { FormPill } from '../../'
+import { FormPill, Badge } from '../../'
 type Props = {
   data: object,
@@ -28,7 +28,7 @@ const MultiValue = (props: Props) => {
         className="text_input_multivalue_container"
         {...props}
     >
-      <If condition={imageUrl}>
+      {/* <If condition={imageUrl}>
         <FormPill
             avatarUrl={imageUrl}
             closeProps={removeProps}
@@ -41,6 +41,29 @@ const MultiValue = (props: Props) => {
             marginRight="xs"
             text={label}
         />
+      </If> */}
+      <If condition={props.selectProps.badges}>
+        <Badge
+            closeProps={removeProps}
+            removeIcon
+            text={label}
+            variant="primary"
+        />
+        <Else />
+        <If condition={imageUrl}>
+          <FormPill
+              avatarUrl={imageUrl}
+              closeProps={removeProps}
+              marginRight="xs"
+              name={label}
+          />
+          <Else />
+          <FormPill
+              closeProps={removeProps}
+              marginRight="xs"
+              text={label}
+          />
+        </If>
       </If>
     </components.MultiValueContainer>
   )

data/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_default.jsx CHANGED Viewed

@@ -13,6 +13,7 @@ const options = [
 const TypeaheadDefault = (props) => {
   return (
     <Typeahead
+        // badges
         label="Colors"
         options={options}
         {...props}

data/app/pb_kits/playbook/pb_typeahead/docs/_typeahead_with_pills.jsx CHANGED Viewed

@@ -1,9 +1,9 @@
 /* @flow */
-import React from 'react'
+import React, { useState } from 'react'
 import { Typeahead } from '../..'
-const options = [
+const initOptions = [
   { label: 'Windows', value: '#FFA500' },
   { label: 'Siding', value: '#FF0000' },
   { label: 'Doors', value: '#00FF00' },
@@ -11,12 +11,16 @@ const options = [
 ]
 const TypeaheadWithPills = (props) => {
+  const [values, setValues] = useState([])
   return (
     <>
       <Typeahead
+          badges
+          createable
           isMulti
           label="Colors"
-          options={options}
+          onChange={(value) => console.log(value)}
+          options={initOptions}
           placeholder=""
           {...props}
       />

data/app/pb_kits/playbook/pb_user_badge/_user_badge.jsx CHANGED Viewed

@@ -23,7 +23,7 @@ const UserBadge = (props: UserBadgeProps) => {
     size = 'md',
   } = props
-  const image = require(`./badges/_${badge}.svg`)
+  const image = require(`./badges/${badge}.svg`)
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
   const classes = classnames(

data/app/pb_kits/playbook/plugins/pb_chart.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import Highcharts from 'highcharts'
 import { highchartsTheme } from '../pb_dashboard/pbChartsLightTheme.js'
-import colors from '../tokens/_colors.scss'
+import colors from '../tokens/exports/_colors.scss'
 require('highcharts/modules/variable-pie')(Highcharts)
 import highchartsMore from 'highcharts/highcharts-more.js'