playbook_ui 6.8.2.pre.alpha1 → 7.0.0.pre.alpha1

data/app/pb_kits/playbook/pb_caption/_caption.html.erb

@@ -1,7 +1,5 @@
-<%= content_tag(object.tag,
-  aria: object.aria,
-  id: object.id,
-  data: object.data,
-  class: object.classname) do %>
-  <%= object.children.present? ? capture(&object.children) : object.text %>
-<% end %>
+<%= content_tag(object.tag, object.text,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    aria: object.aria) %>

data/app/pb_kits/playbook/pb_caption/_caption.jsx

@@ -14,7 +14,6 @@ type CaptionProps = {
   size?: "xs" | "sm" | "md" | "lg" | "xl",
   tag?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "p" | "span" | "div",
   text?: string,
-  variant?: null | "link",
 }
 
 const Caption = (props: CaptionProps) => {
@@ -27,16 +26,15 @@ const Caption = (props: CaptionProps) => {
     size = 'md',
     tag = 'div',
     text,
-    variant = null,
   } = props
   const Tag = `${tag}`
 
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
   const css = classnames(
-    buildCss('pb_caption_kit', size, variant),
-    globalProps(props),
-    className
+    buildCss('pb_caption_kit', size),
+    className,
+    globalProps(props)
   )
 
   return (

data/app/pb_kits/playbook/pb_caption/_caption.scss

@@ -9,11 +9,5 @@
 
   &[class^=pb_caption_kit_xs] {
     @include caption_xs;
-    &[class*=_link]  {
-      color: $primary;
-    }
-  }
-  &[class*=dark]{
-    @include caption_dark
   }
 }

data/app/pb_kits/playbook/pb_caption/caption.rb

@@ -14,12 +14,9 @@ module Playbook
                  values: %w[h1 h2 h3 h4 h5 h6 p span div],
                  default: "div"
       prop :text
-      prop :variant, type: Playbook::Props::Enum,
-                     values: [nil, "link"],
-                     default: nil
 
       def classname
-        generate_classname("pb_caption_kit", size, variant)
+        generate_classname("pb_caption_kit", size)
       end
     end
   end

data/app/pb_kits/playbook/pb_caption/docs/_caption_dark.html.erb

@@ -0,0 +1,3 @@
+<%= pb_rails("caption", props: { text: "Caption", dark: true }) %>
+<%= pb_rails("caption", props: { text: "Caption Large", size: 'lg', dark: true  }) %>
+<%= pb_rails("caption", props: { text: "Subcaption", size: 'xs', dark: true  }) %>

data/app/pb_kits/playbook/pb_caption/docs/_caption_dark.jsx

@@ -0,0 +1,25 @@
+import React from 'react'
+import { Caption } from '../../'
+
+const CaptionDark = () => {
+  return (
+    <div>
+      <Caption
+          dark
+          text="Caption"
+      />
+      <Caption
+          dark
+          size="lg"
+          text="Caption Large"
+      />
+      <Caption
+          dark
+          size="xs"
+          text="Subcaption"
+      />
+    </div>
+  )
+}
+
+export default CaptionDark

data/app/pb_kits/playbook/pb_caption/docs/_caption_light.jsx

@@ -1,20 +1,15 @@
 import React from 'react'
 import { Caption } from '../../'
 
-const CaptionLight = (props) => {
+const CaptionLight = () => {
   return (
     <div>
+      <Caption text="Caption" />
       <Caption
-          {...props}
-          text="Caption"
-      />
-      <Caption
-          {...props}
           size="lg"
           text="Caption Large"
       />
       <Caption
-          {...props}
           size="xs"
           text="Subcaption"
       />

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

@@ -1,7 +1,7 @@
 examples:
   rails:
-  - caption_light: Default
-  - caption_block: Block
+  - caption_light: Light UI
+  - caption_dark: Dark UI
   react:
-  - caption_light: Default
-  - caption_block: Block
+  - caption_light: Light UI
+  - caption_dark: Dark UI

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

@@ -1,3 +1,2 @@
+export { default as CaptionDark } from './_caption_dark.jsx'
 export { default as CaptionLight } from './_caption_light.jsx'
-export { default as CaptionVariants } from './_caption_variants.jsx'
-export { default as CaptionBlock } from './_caption_block.jsx'

data/app/pb_kits/playbook/pb_card/_card.jsx

@@ -20,7 +20,7 @@ type CardPropTypes = {
 }
 
 type CardHeaderProps = {
-  headerColor?: string,
+  categoryColor?: number,
   children: array<React.ReactNode> | React.ReactNode,
   className?: string,
   padding?: string,
@@ -34,13 +34,13 @@ type CardBodyProps = {
 
 // Header component
 const Header = (props: CardHeaderProps) => {
-  const { children, className, headerColor = 'category_1', padding = 'sm' } = props
-  const headerCSS = buildCss('pb_card_header_kit', `${headerColor}`)
+  const { children, className, categoryColor = 1, padding = 'sm' } = props
+  const headerCSS = buildCss('pb_card_header_kit', `category_${categoryColor}`)
 
   const headerSpacing = globalProps(props, { padding })
 
   return (
-    <div className={classnames(headerCSS, headerSpacing, className)}>
+    <div className={classnames(headerCSS, className, headerSpacing)}>
       {children}
     </div>
   )
@@ -48,12 +48,13 @@ const Header = (props: CardHeaderProps) => {
 
 // Body component
 const Body = (props: CardBodyProps) => {
-  const { children, padding = 'md', className } = props
+  const { children, className, padding = 'md' } = props
   const bodyCSS = buildCss('pb_card_body_kit')
+
   const bodySpacing = globalProps(props, { padding })
 
   return (
-    <div className={classnames(bodyCSS, bodySpacing, className)}>
+    <div className={classnames(bodyCSS, className, bodySpacing)}>
       {children}
     </div>
   )
@@ -69,6 +70,7 @@ const Card = (props: CardPropTypes) => {
     shadow = 'none',
     padding = 'md',
   } = props
+  const bodyCSS = buildCss('pb_card_body_kit')
   const borderCSS = borderNone == true ? 'border_none' : ''
   const cardCss = buildCss('pb_card_kit', `shadow_${shadow}`, `${borderCSS}`, {
     selected,
@@ -92,9 +94,11 @@ const Card = (props: CardPropTypes) => {
   const nonHeaderChildren = cardChildren.filter((child) => (get(child, 'type.displayName') !== 'Header'))
 
   return (
-    <div className={classnames(cardCss, globalProps(props, { padding }), className)}>
+    <div className={classnames(cardCss, globalProps(props), className)}>
       {subComponentTags('Header')}
-      {nonHeaderChildren}
+      <div className={classnames(bodyCSS, globalProps({ padding }))}>
+        {nonHeaderChildren}
+      </div>
     </div>
   )
 }

data/app/pb_kits/playbook/pb_card/_card.scss

@@ -27,7 +27,7 @@
     min-height: 1px;
     border: 0;
     border-radius: $pb_card_header_border_radius $pb_card_header_border_radius 0px 0px;  
-    @each $color_name, $color_value in $pb_card_header_colors {
+    @each $color_name, $color_value in $category_colors {
       &[class*=_#{$color_name}] {
         @include pb_card_header_color($color_value);
       }
@@ -40,6 +40,9 @@
     flex-basis: auto;
     min-height: 1px;
     border: 0;
+    &.dark {
+      @include pb_card_dark;
+    }
   }
   
   @each $name, $shadow in $box_shadows {

data/app/pb_kits/playbook/pb_card/_card_mixin.scss

@@ -9,7 +9,7 @@ $pb_card_border_width: 1px;
 $pb_card_border_radius: $border_rad_heavier;
 $pb_card_highlight_colors: map-merge(map-merge($status_colors, $product_colors), $category_colors);
 $pb_card_highlight_size: 4px;
-$pb_card_header_colors: map-merge($category_colors, $product_colors);
+$pb_card_header_colors: $category_colors;
 $pb_card_header_border_radius: $border_rad_heavy;
 $pb_card_padding:(
   none: 0,
@@ -53,7 +53,6 @@ $pb_card_padding:(
 }
 
 @mixin pb_card_dark {
-  color: $white;
   @include pb_card($card_dark, $border_dark);
 }
 
@@ -68,6 +67,6 @@ $pb_card_padding:(
   z-index: 10;
 }
 
-@mixin pb_card_header_color($header_color) {
-  background: $header_color;
-}
+@mixin pb_card_header_color($category_color) {
+  background: $category_color;
+}

data/app/pb_kits/playbook/pb_card/card_header.rb

@@ -7,11 +7,11 @@ module Playbook
   
         partial "pb_card/child_kits/card_header"
   
-        prop :header_color, type: Playbook::Props::String,
-                            default: "category_1"
+        prop :category_color, type: Playbook::Props::Numeric,
+                              default: 1
 
         def classname
-          generate_classname("pb_card_header_kit", header_color)
+          generate_classname("pb_card_header_kit", padding, "category_#{category_color}")
         end
       end
     end

data/app/pb_kits/playbook/pb_card/docs/_card_border_none.jsx

@@ -1,16 +1,13 @@
 import React from 'react'
 import Card from '../_card.jsx'
 
-const CardBorderNone = (props) => {
+const CardBorderNone = () => {
   return (
+    <div className="bg-light-doc-example">
 
-    <Card
-        {...props}
-        borderNone
-    >
-      {'Card content'}
-    </Card>
+      <Card borderNone>{'Card content'}</Card>
 
+    </div>
   )
 }
 

data/app/pb_kits/playbook/pb_card/docs/_card_content.jsx

@@ -1,12 +1,12 @@
 import React from 'react'
 import { Card } from '../../'
 
-const CardContent = (props) => {
+const CardContent = () => {
   return (
     <div>
-      <Card {...props}>{'Card content'}</Card>
+      <Card>{'Card content'}</Card>
       <br />
-      <Card {...props}>
+      <Card>
         {`Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec iaculis, risus a fringilla luctus, sapien eros sodales ex, quis molestie est nulla non turpis. Vestibulum aliquet at ipsum eget posuere. Morbi sed laoreet erat. Sed commodo posuere lectus, at porta nulla ornare a. Suspendisse quam est, sollicitudin ut enim sit amet, commodo placerat enim. Donec laoreet metus ac mauris pellentesque mattis. Pellentesque luctus vel mauris non aliquam. Mauris hendrerit mattis porttitor. Curabitur vehicula justo non ex consectetur commodo. Quisque posuere aliquet quam. Maecenas malesuada magna mauris, ac tempor metus euismod at.
 
 Cras ornare fermentum magna mollis efficitur. Sed vitae nulla vel purus ultrices mollis. Maecenas id nulla id libero faucibus feugiat quis sit amet turpis. In commodo pellentesque risus at fringilla. Integer non interdum leo, non commodo ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut mi augue, dignissim at orci vel, egestas aliquam mi. Proin finibus aliquet tempor. Integer cursus, ex quis gravida rhoncus, nisi elit viverra ipsum, non efficitur est ex ac tortor. Praesent vitae odio massa.`}

data/app/pb_kits/playbook/pb_card/docs/_card_dark.html.erb

@@ -0,0 +1,3 @@
+<%= pb_rails("card", props: { dark: true }) do %>
+  Card Content
+<% end %>

data/app/pb_kits/playbook/pb_card/docs/_card_dark.jsx

@@ -0,0 +1,12 @@
+import React from 'react'
+import Card from '../_card.jsx'
+
+const CardDark = () => {
+  return (
+    <div>
+      <Card dark>{'Card content'}</Card>
+    </div>
+  )
+}
+
+export default CardDark

data/app/pb_kits/playbook/pb_card/docs/_card_header.html.erb

@@ -1,50 +1,19 @@
-<%= pb_rails("title", props: { text: "Category Colors", tag: "h4", size: 4 }) %>
- 
-<br>  
-
-  <%= pb_rails("card", props: { padding: "none", header: true}) do %>
-    <%= pb_rails("card/card_header", props: { padding: "sm" }) do %>
-      <%= pb_rails("body", props: { text: "category_1", dark: true }) %>
-    <% end %>
-    <%= pb_rails("card/card_body", props: { padding: "md" }) do %>
-      Body
-    <% end %>
-  <% end %>
-
-<br> 
-
-  <%= pb_rails("card", props: { padding: "none", header: true}) do %>
-    <%= pb_rails("card/card_header", props: { padding: "sm", header_color: "category_2" }) do %>
-      <%= pb_rails("body", props: { text: "category_2", dark: true }) %>
-
-    <% end %>
-    <%= pb_rails("card/card_body", props: { padding: "md" }) do %>
-      Body
-    <% end %>
-  <% end %>
-
-<br>
-
-<%= pb_rails("title", props: { text: "Product Colors", tag: "h4", size: 4 }) %> 
-
-<br>
-
 <%= pb_rails("card", props: { padding: "none", header: true}) do %>
-  <%= pb_rails("card/card_header", props: { padding: "sm", header_color: "siding" }) do %>
-    <%= pb_rails("body", props: { text: "Siding", dark: true }) %>
+  <%= pb_rails("card/card_header", props: { padding: "sm" }) do %>
+      <%= pb_rails("body", props: { text: "Header", dark: true }) %>
   <% end %>
-  <%= pb_rails("card/card_body", props: { padding: "md" }) do %>
+  <%= pb_rails("card/card_body", props: { padding: "sm" }) do %>
     Body
   <% end %>
 <% end %>
 
-<br>
+<br />
 
 <%= pb_rails("card", props: { padding: "none", header: true}) do %>
-  <%= pb_rails("card/card_header", props: { padding: "sm", header_color: "gutters" }) do %>
-    <%= pb_rails("body", props: { text: "Gutters", dark: true }) %>
+  <%= pb_rails("card/card_header", props: { padding: "md", category_color: 2 }) do %>
+    <%= pb_rails("body", props: { text: "Header", dark: true }) %>
   <% end %>
-  <%= pb_rails("card/card_body", props: { padding: "md" }) do %>
+  <%= pb_rails("card/card_body", props: { padding: "lg" }) do %>
     Body
   <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_card/docs/_card_header.jsx

@@ -1,113 +1,39 @@
 import React from 'react'
-import { Body, Card, Title } from '../../'
+import { Body, Card } from '../../'
 
-const CardHeader = (props) => {
+const CardHeader = () => {
   return (
     <div>
-      <Title
-          {...props}
-          size={4}
-          tag="h4"
-          text="Category Colors"
-      />
-
-      <br />
-
-      <Card
-          {...props}
-          padding="none"
-      >
+      <Card padding="none">
         <Card.Header>
           <Body
-              {...props}
-              text="category_1"
+              dark
+              text="Header"
           />
         </Card.Header>
         <Card.Body>
-          <Body
-              {...props}
-              text="Body"
-          />
+          <Body text="Body" />
         </Card.Body>
       </Card>
 
       <br />
 
-      <Card
-          {...props}
-          padding="none"
-      >
+      <Card padding="none">
         <Card.Header
-            headerColor="category_2"
-        >
-          <Body
-              {...props}
-              text="category_2"
-          />
-        </Card.Header>
-        <Card.Body
+            categoryColor={2}
             padding="md"
         >
           <Body
-              {...props}
-              text="Body"
-          />
-        </Card.Body>
-      </Card>
-
-      <br />
-
-      <Title
-          {...props}
-          size={4}
-          tag="h4"
-          text="Product Colors"
-      />
-
-      <br />
-
-      <Card
-          {...props}
-          padding="none"
-      >
-        <Card.Header
-            headerColor="siding"
-        >
-          <Body
-              {...props}
-              text="Siding"
+              dark
+              text="Header"
           />
         </Card.Header>
-        <Card.Body>
-          <Body
-              {...props}
-              text="Body"
-          />
-        </Card.Body>
-      </Card>
-
-      <br />
-
-      <Card
-          {...props}
-          padding="none"
-      >
-        <Card.Header
-            headerColor="gutters"
+        <Card.Body
+            padding="lg"
         >
-          <Body
-              {...props}
-              text="Gutters"
-          />
-        </Card.Header>
-        <Card.Body>
-          <Body
-              {...props}
-              text="Body"
-          />
+          <Body text="Body" />
         </Card.Body>
       </Card>
-
     </div>
   )
 }