playbook_ui 7.0.0.pre.alpha6 → 7.0.0.pre.alpha11

data/app/pb_kits/playbook/pb_text_input/_text_input.html.erb

@@ -14,6 +14,7 @@
       <% end %>
     <% else %>
       <%= tag(:input,
+          autocomplete: object.autocomplete ? nil : "off",
           class: "text_input",
           data: object.validation_data,
           disabled: object.disabled,

data/app/pb_kits/playbook/pb_text_input/_text_input.jsx

@@ -13,6 +13,7 @@ type TextInputProps = {
   aria?: object,
   className: string,
   data?: object,
+  dark?: boolean,
   disabled?: boolean,
   error?: string,
   id?: string,
@@ -26,30 +27,32 @@ type TextInputProps = {
   children: Node,
 }
 
-const TextInput = ({
-  aria = {},
-  className,
-  data = {},
-  disabled,
-  error,
-  id,
-  name,
-  label,
-  onChange = () => {},
-  placeholder,
-  required,
-  type = 'text',
-  value,
-  children = null,
-  ...props
-}: TextInputProps) => {
+const TextInput = (props: TextInputProps) => {
+  const {
+    aria = {},
+    className,
+    data = {},
+    dark = false,
+    disabled,
+    error,
+    id,
+    name,
+    label,
+    onChange = () => {},
+    placeholder,
+    required,
+    type = 'text',
+    value,
+    children = null,
+  } = props
+
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
   const css = classnames([
     'pb_text_input_kit',
-    className,
     error ? 'error' : null,
     globalProps(props),
+    className,
   ])
 
   return (
@@ -60,6 +63,7 @@ const TextInput = ({
     >
       <Caption
           className="pb_text_input_kit_label"
+          dark={dark}
           text={label}
       />
       <div className="text_input_wrapper">

data/app/pb_kits/playbook/pb_text_input/_text_input.scss

@@ -13,17 +13,22 @@
     margin-bottom: $space_sm;
     display: block;
 
-    input::placeholder {
+    input::placeholder,
+    .text_input .placeholder {
       @include pb_body_light;
     }
 
-    input {
+    input,
+    .text_input {
       @include pb_textarea_light;
       @include pb_title_4;
       overflow: hidden;
     }
 
-    input:focus, input:-webkit-autofill:focus {
+    input:focus,
+    .text_input:focus,
+    input:-webkit-autofill:focus,
+    .text_input:-webkit-autofill:focus {
       @include pb_textarea_focus;
       -webkit-box-shadow: 0 0 0px 1000px $focus_input_light inset;
       transition: background-color 5000s ease-in-out 0s;
@@ -34,18 +39,22 @@
     .text_input_wrapper {
       margin-bottom: 1rem;
 
-      input::placeholder {
+      input::placeholder,
+      .text_input .placeholder {
         @include pb_body_light_dark;
       }
 
-      input {
+      input, .text_input {
         @include pb_textarea_dark;
         @include pb_title_4;
         @include pb_title_dark;
         overflow: hidden;
       }
 
-      input:focus, input:-webkit-autofill:focus {
+      input:focus,
+      .text_input:focus,
+      input:-webkit-autofill:focus,
+      .text_input:-webkit-autofill:focus {
         @include pb_textarea_focus_dark;
         -webkit-box-shadow: 0 0 0px 1000px $focus_input_dark inset;
         transition: background-color 5000s ease-in-out 0s;
@@ -54,7 +63,7 @@
 
     &.error {
       .text_input_wrapper {
-        input {
+        input, .text_input {
           border-color: $error_dark;
         }
       }
@@ -66,7 +75,7 @@
       [class*=pb_body_kit] {
         margin-top: $space_xs / 2;
       }
-      input {
+      input, .text_input {
         border-color: $error;
       }
     }

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

@@ -1,16 +1,11 @@
 examples:
   rails:
   - text_input_default: Default
-  - text_input_dark: Dark
   - text_input_error: With Error
-  - text_input_dark_error: Dark With Error
   - text_input_custom: Custom
   - text_input_disabled: Disabled
   react:
   - text_input_default: Default
-  - text_input_dark: Dark
   - text_input_error: With Error
-  - text_input_dark_error: Dark With Error
   - text_input_custom: Custom
   - text_input_disabled: Disabled
-

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

@@ -1,6 +1,4 @@
 export { default as TextInputDefault } from './_text_input_default.jsx'
-export { default as TextInputDark } from './_text_input_dark.jsx'
-export { default as TextInputDarkError } from './_text_input_dark_error.jsx'
 export { default as TextInputCustom } from './_text_input_custom.jsx'
 export { default as TextInputError } from './_text_input_error.jsx'
 export { default as TextInputDisabled } from './_text_input_disabled.jsx'

data/app/pb_kits/playbook/pb_text_input/text_input.rb

@@ -7,6 +7,8 @@ module Playbook
 
       partial "pb_text_input/text_input"
 
+      prop :autocomplete, type: Playbook::Props::Boolean,
+                          default: true
       prop :disabled, type: Playbook::Props::Boolean,
                       default: false
       prop :error

data/app/pb_kits/playbook/pb_textarea/_textarea.jsx

@@ -42,7 +42,7 @@ const Textarea = ({
 }: TextareaProps) => {
   const errorClass = error ? 'error' : null
   const resizeClass = `resize_${resize}`
-  const classes = classnames('pb_textarea_kit', className, errorClass, resizeClass, globalProps(props))
+  const classes = classnames('pb_textarea_kit', errorClass, resizeClass, globalProps(props), className)
 
   return (
     <div className={classes}>

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

@@ -3,17 +3,14 @@ examples:
   rails:
   - textarea_default: Default
   - textarea_custom: Custom Textarea Input
-  - textarea_dark: Dark
   - textarea_resize: Resize
   - textarea_error: Textarea w/ Error
-  - textarea_dark_error: Textarea w/ Error
+
 
 
 
   react:
   - textarea_default: Default
   - textarea_custom: Custom Textarea Input
-  - textarea_dark: Dark
   - textarea_resize: Resize
   - textarea_error: Textarea w/ Error
-  - textarea_dark_error: Textarea w/ Error

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

@@ -1,6 +1,4 @@
 export { default as TextareaDefault } from './_textarea_default.jsx'
 export { default as TextareaResize } from './_textarea_resize.jsx'
 export { default as TextareaCustom } from './_textarea_custom.jsx'
-export { default as TextareaDark } from './_textarea_dark.jsx'
 export { default as TextareaError } from './_textarea_error.jsx'
-export { default as TextareaDarkError } from './_textarea_dark_error.jsx'

data/app/pb_kits/playbook/pb_time/_time.html.erb

@@ -2,32 +2,38 @@
     id: object.id,
     data: object.data,
     class: object.classname) do %>
-  <% if object.size == "lg" %>
-    <%= pb_rails("title", props: { tag: "span", text: object.format_time_string, size: 3 }) %>
-    <%= content_tag(:span) do %>
+    <%
+      # convert deprecated prop values
+      size = object.size
+      size = "sm" if object.size == "xs"
+      size = "md" if object.size == "lg"
+    %>
+  <% if size == "md" %>
+    <% if object.show_icon %>
+      <%= pb_rails("body", props: { color: "light", tag: "span"}) do %>
+        <%= pb_rails("icon", props: { icon: "clock", fixed_width: true, size: "lg" }) %>
+      <% end %>
+    <% end %>
+    <%= pb_rails("caption", props: { tag: "span", text: object.format_time_string, size: "lg" }) %>
+    <% if object.show_timezone %>
       <%= content_tag(:span, class: "pb_time_timezone") do %>
         <%= object.pb_date_time.to_timezone.upcase %>
       <% end %>
     <% end %>
-  <% elsif object.size == "sm" %>
-    <%= pb_rails("body", props: { tag: "span", text: object.format_time_string }) do %>
-      <%= pb_rails("icon", props: { icon: "clock", fixed_width: true }) %>
-      <%= content_tag(:time, datetime: object.pb_date_time.to_iso) do %>
-        <%= content_tag(:span) do %>
-          <%= object.format_time_string %>
-          <%= content_tag(:span, class: "pb_time_timezone") do %>
-            <%= object.pb_date_time.to_timezone.upcase %>
-          <% end %>
-        <% end %>
+  <% else %>
+    <% if object.show_icon %>
+      <%= pb_rails("body", props: { color: "light", tag: "span"}) do %>
+        <%= pb_rails("icon", props: { icon: "clock", fixed_width: true }) %>
       <% end %>
     <% end %>
-  <% else %>
-    <%= pb_rails("body", props: { tag: "span", text: object.format_time_string }) do %>
+    <%= pb_rails("body", props: { color: "light", tag: "span", text: object.format_time_string }) do %>
       <%= content_tag(:time, datetime: object.pb_date_time.to_iso) do %>
         <%= content_tag(:span) do %>
           <%= object.format_time_string %>
-          <%= content_tag(:span, class: "pb_time_timezone") do %>
-            <%= object.pb_date_time.to_timezone.upcase %>
+          <% if object.show_timezone %>
+            <%= content_tag(:span, class: "pb_time_timezone") do %>
+              <%= object.pb_date_time.to_timezone.upcase %>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>

data/app/pb_kits/playbook/pb_time/_time.jsx

@@ -7,24 +7,26 @@ import DateTime from '../pb_kit/dateTime.js'
 import { buildCss } from '../utilities/props'
 import { globalProps } from '../utilities/globalProps.js'
 
-import { Body, Icon, Title  } from '../'
+import { Body, Caption, Icon } from '../'
 
 type TimeProps = {
   align?: 'left' | 'center' | 'right',
   className?: string | array<string>,
   data?: string,
   date: string,
+  dark?: boolean,
   id?: string,
-  size?: 'lg' | 'sm' | 'xs',
+  showIcon?: boolean,
+  size?: 'md' | 'sm',
   timeZone?: string,
 }
 
 const Time = (props: TimeProps) => {
-  const { align, className, date, size, timeZone } = props
+  const { align, className, date, showIcon, size, timeZone } = props
   const classes = classnames(
-    className,
     buildCss('pb_time_kit', align, size),
-    globalProps(props)
+    globalProps(props),
+    className
   )
 
   const dateTimestamp = new DateTime({ value: date, zone: timeZone })
@@ -32,23 +34,30 @@ const Time = (props: TimeProps) => {
   return (
     <div className={classes}>
       <span className="pb_body_kit">
-        <If condition={size === 'sm'}>
-          <Icon
-              fixedWidth
-              icon="clock"
-          />
+        <If condition={showIcon}>
+          <Body
+              color="light"
+              tag="span"
+          >
+            <Icon
+                fixedWidth
+                icon="clock"
+                size={size === 'md' ? 'lg' : 'sm'}
+            />
+          </Body>
           {' '}
         </If>
         <time dateTime={date}>
           <span>
-            <If condition={size !== 'lg'}>
+            <If condition={size !== 'md'}>
               <Body
+                  color="light"
                   tag="span"
                   text={dateTimestamp.toTimeWithMeridian()}
               />
               <Else />
-              <Title
-                  size={3}
+              <Caption
+                  size="lg"
                   tag="span"
                   text={dateTimestamp.toTimeWithMeridian()}
               />

data/app/pb_kits/playbook/pb_time/_time.scss

@@ -2,9 +2,11 @@
 @import "../tokens/typography";
 @import "../pb_icon/icon";
 @import "../pb_body/body";
-@import "../pb_title/title";
+@import "../pb_caption/caption";
 
 [class^=pb_time_kit] {
+  letter-spacing: $lspace_looser;
+  text-transform: uppercase;
   &[class*=_center]  {
     text-align: center;
   }
@@ -18,27 +20,33 @@
   }
 
   [class^=pb_time_timezone] {
-    font-size: $font-small;
-    font-weight: $regular;
-    color: $text-lt-light;
+    color: $text_lt_light;
+    font-weight: $bold;
 
     &::before {
       content: " ";
     }
   }
 
-  &[class*=_lg] {
+  &[class*=_md] {
+    [class^=pb_caption_kit] {
+      color: $text_lt_default;
+      letter-spacing: $lspace_tight;
+      text-transform: capitalize;
+    }
     [class^=pb_time_timezone] {
+      color: $text_lt_light;
       font-size: $font-large !important;
-      color: $text-lt-light;
+      font-weight: $regular;
+      letter-spacing: $lspace_tight;
     }
   }
 
   &.dark {
-    & > * [class^=pb_title_kit] {
+    [class^=pb_caption_kit] {
       color: $text_dk_default;
     }
-    & > * [class^=pb_body_kit] {
+    [class^=pb_body_kit] {
       color: $text_dk_light;
     }
   }

data/app/pb_kits/playbook/pb_time/docs/_time_align.html.erb

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

data/app/pb_kits/playbook/pb_time/docs/_time_align.jsx

@@ -6,19 +6,19 @@ const TimeAlign = () => {
     <div>
       <Time
           date={new Date()}
-          size="lg"
+          size="md"
       />
       <br />
       <Time
           align="center"
           date={new Date()}
-          size="lg"
+          size="md"
       />
       <br />
       <Time
           align="right"
           date={new Date()}
-          size="lg"
+          size="md"
       />
     </div>
   )

data/app/pb_kits/playbook/pb_time/docs/_time_default.html.erb

@@ -1,18 +1,62 @@
 <%= pb_rails("time", props: {
+  show_timezone: false,
   time: Time.now,
-  size: "lg"
 }) %>
 
 <br>
 
 <%= pb_rails("time", props: {
   time: DateTime.now,
-  size: "sm"
+  timezone: "America/Chicago"
 }) %>
 
 <br>
 
 <%= pb_rails("time", props: {
   time: "2012-08-02T15:49:29Z",
-  size: "xs"
+  show_icon: true,
+  show_timezone: false,
+}) %>
+
+<br>
+
+<%= pb_rails("time", props: {
+  time: "2012-08-02T15:49:29Z",
+  show_icon: true,
+  timezone: "America/Chicago"
+}) %>
+
+ <br>
+ <br>
+
+ <%= pb_rails("time", props: {
+  time: Time.now,
+  size: "md",
+  show_timezone: false,
+}) %>
+
+<br>
+
+<%= pb_rails("time", props: {
+  size: "md",
+  time: DateTime.now,
+  timezone: "America/New_York",
+}) %>
+
+<br>
+
+<%= pb_rails("time", props: {
+  show_icon: true,
+  size: "md",
+  show_timezone: false,
+  time: "2012-08-02T15:49:29Z",
+}) %>
+
+<br>
+
+<%= pb_rails("time", props: {
+  show_icon: true,
+  size: "md",
+  time: "2012-08-02T15:49:29Z",
+  timezone: "America/New_York",
 }) %>