playbook_ui 2.9.1 → 2.9.2

data/app/pb_kits/playbook/pb_button/docs/_button_accessibility.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import Button from '../_button.jsx'
+import {Button} from '../../'
 
 const ButtonAccessibility = () => (
     <div>

data/app/pb_kits/playbook/pb_button/docs/_button_block_content.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import Button from '../_button.jsx'
+import {Button} from '../../'
 
 const ButtonBlockContent = () => (
     <div>

data/app/pb_kits/playbook/pb_button/docs/_button_default.jsx

@@ -1,9 +1,9 @@
 import React from 'react'
-import Button from '../_button.jsx'
+import {Button} from '../../'
 
 const ButtonDefault = () => (
     <div>
-        <Button text="Button Primary"/>
+        <Button text="Button Primary" />
         <Button
                 text="Button Secondary"
                 variant="secondary"

data/app/pb_kits/playbook/pb_button/docs/_button_default_dark.jsx

@@ -1,9 +1,9 @@
 import React from 'react'
-import Button from '../_button.jsx'
+import {Button} from '../../'
 
 const ButtonDefaultDark = () => (
     <div>
-        <Button text="Button Primary"/>
+        <Button text="Button Primary" />
         <Button
                 text="Button Secondary"
                 variant="secondary"

data/app/pb_kits/playbook/pb_button/docs/_button_full_width.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import Button from '../_button.jsx'
+import {Button} from '../../'
 
 const ButtonFullWidth = () => (
     <div>

data/app/pb_kits/playbook/pb_button/docs/_button_link.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import Button from '../_button.jsx'
+import {Button} from '../../'
 
 const ButtonLink = () => (
     <div>

data/app/pb_kits/playbook/pb_button/docs/_button_loading.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import Button from '../_button.jsx'
+import {Button} from '../../'
 
 const ButtonLoading = () => (
     <div>

data/app/pb_kits/playbook/pb_button/docs/_button_options.html.erb

@@ -0,0 +1 @@
+<%= pb_rails("button", props: { text: "Button with options", value: "1234", type: "submit" }) %>

data/app/pb_kits/playbook/pb_button/docs/_button_options.jsx

@@ -0,0 +1,14 @@
+import React from 'react'
+import Button from '../_button.jsx'
+
+const ButtonOptions = () => (
+    <div>
+        <Button
+            htmlType="submit"
+            text="Button with options"
+            value="1234"
+        />
+    </div>
+)
+
+export default ButtonOptions

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

@@ -7,6 +7,7 @@ examples:
   - button_loading: Button Loading
   - button_block_content: Button Block Content
   - button_accessibility: Button Accessibility Options
+  - button_options: Button Additional Options
   react:
   - button_default: Button Variants
   - button_default_dark: Button Variants Dark
@@ -14,4 +15,5 @@ examples:
   - button_link: Button Links
   - button_loading: Button Loading
   - button_block_content: Button Block Content
-  - button_accessibility: Button Accessibility Options
+  - button_accessibility: Button Accessibility Options
+  - button_options: Button Additional Options

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

@@ -5,3 +5,4 @@ export {default as ButtonLoading} from './_button_loading.jsx'
 export {default as ButtonBlockContent} from './_button_block_content.jsx'
 export {default as ButtonAccessibility} from './_button_accessibility.jsx'
 export {default as ButtonDefaultDark} from './_button_default_dark.jsx'
+export {default as ButtonOptions} from './_button_options.jsx'

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

@@ -5,6 +5,8 @@ module Playbook
     class Caption
       include Playbook::Props
 
+      partial "pb_caption/caption"
+
       prop :dark, type: Playbook::Props::Boolean, default: false
       prop :large, type: Playbook::Props::Boolean, default: false
       prop :tag, type: Playbook::Props::Enum,
@@ -13,18 +15,7 @@ module Playbook
       prop :text, default: "Caption"
 
       def classname
-        [
-          [
-            "pb_caption_kit",
-            large_class,
-            dark_class,
-          ].compact.join("_"),
-          prop(:classname),
-        ].join(" ")
-      end
-
-      def to_partial_path
-        "pb_caption/caption"
+        generate_classname("pb_caption_kit", large_class, dark_class)
       end
 
     private

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

@@ -1,5 +1,5 @@
 import React from "react"
-import Caption from "../_caption.jsx"
+import {Caption} from '../../'
 
 function CaptionDark() {
   return (

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

@@ -1,5 +1,5 @@
 import React from "react"
-import Caption from "../_caption.jsx"
+import {Caption} from '../../'
 
 function CaptionLight() {
   return (

data/app/pb_kits/playbook/pb_card/_card.html.erb

@@ -1,7 +1,9 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname(object.kit_class),
+    class: object.classname,
     aria: object.aria) do %>
-  <%= object.yield(context: self) %>
+  <% if object.block %>
+    <%= pb_rails("card/card_body", props: { padding: object.padding}) { capture(&object.block) } %>
+  <% end %>
 <% end %>

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

@@ -2,77 +2,32 @@
 
 module Playbook
   module PbCard
-    class Card < Playbook::PbKit::Base
-      PROPS = %i[configured_aria
-                 configured_classname
-                 configured_data
-                 configured_id
-                 configured_padding
-                 configured_selected
-                 configured_shadow
-                 block].freeze
+    class Card
+      include Playbook::Props
 
-      def initialize(aria: default_configuration,
-                     classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     padding: default_configuration,
-                     selected: default_configuration,
-                     shadow: default_configuration,
-                     &block)
-        self.configured_aria = aria
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_padding = padding
-        self.configured_selected = selected
-        self.configured_shadow = shadow
-        self.block = block_given? ? block : nil
-      end
-
-      def selected_class
-        true_value(configured_selected, "selected", "deselected")
-      end
+      partial "pb_card/card"
 
-      def shadow
-        shadow_options = %w[none shallow default deep deeper deepest]
-        one_of_value(configured_shadow, shadow_options, "none")
-      end
-
-      def shadow_class
-        adjusted_value(shadow, "shadow_#{shadow}", nil)
-      end
+      prop :selected, type: Playbook::Props::Boolean, default: false
+      prop :padding, type: Playbook::Props::Enum,
+                     values: %w[none xs sm md lg xl],
+                     default: "md"
+      prop :shadow, type: Playbook::Props::Enum,
+                    values: %w[none shallow default deep deeper deepest],
+                    default: "none"
 
-      def yield(context:)
-        unless block.nil?
-          pb_card_body = Playbook::PbCard::CardBody.new(padding: configured_padding) do
-            context.capture(&block)
-          end
-          ApplicationController.renderer.render(partial: pb_card_body, as: :object)
-        end
+      def classname
+        generate_classname("pb_card_kit", selected_class, shadow_class)
       end
 
-      def kit_class
-        card_options = [
-          "pb_card_kit",
-          selected_class,
-          shadow_class,
-        ]
-        card_options.reject(&:nil?).join("_")
-      end
+    private
 
-      def to_partial_path
-        "pb_card/card"
+      def selected_class
+        selected ? "selected" : "deselected"
       end
 
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def shadow_class
+        shadow != "none" ? "shadow_#{shadow}" : nil
       end
-      attr_accessor(*PROPS)
     end
   end
 end

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

@@ -2,57 +2,18 @@
 
 module Playbook
   module PbCard
-    class CardBody < Playbook::PbKit::Base
-      PROPS = %i[configured_aria
-                 configured_classname
-                 configured_data
-                 configured_id
-                 configured_padding
-                 block].freeze
+    class CardBody
+      include Playbook::Props
 
-      def initialize(aria: default_configuration,
-                     classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     padding: default_configuration,
-                     &block)
-        self.configured_aria = aria
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_padding = padding
-        self.block = block_given? ? block : nil
-      end
-
-      def padding_class
-        padding_options = %w[none xs sm md lg xl]
-        one_of_value(configured_padding.to_s, padding_options, "md")
-      end
-
-      def yield(context:)
-        context.capture(&block)
-      end
-
-      def kit_class
-        card_body_options = [
-          "pb_card_body_kit",
-          padding_class,
-        ]
-        card_body_options.join("_")
-      end
-
-      def to_partial_path
-        "pb_card/child_kits/card_body"
-      end
+      partial "pb_card/child_kits/card_body"
 
-    private
+      prop :padding, type: Playbook::Props::Enum,
+                     values: %w[none xs sm md lg xl],
+                     default: "md"
 
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_card_body_kit", padding)
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_card/child_kits/_card_body.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname(object.kit_class),
+    class: object.classname,
     aria: object.aria) do %>
-  <%= object.yield(context: self) %>
+  <%= capture(&object.block) %>
 <% end %>

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import Card from '../_card.jsx'
+import {Card} from '../../'
 
 function CardContent() {
   return (

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import Card from '../_card.jsx'
+import {Card} from '../../'
 
 function CardPadding() {
   return (

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import Card from '../_card.jsx'
+import {Card} from '../../'
 
 function CardShadow() {
   return (

data/app/pb_kits/playbook/pb_checkbox/_checkbox.html.erb

@@ -1,10 +1,9 @@
-<%= content_tag(:label, id: object.id, data: object.data, class: object.classname(object.kit_class)) do %>
-<input type="checkbox" value="<%=object.value%>" name="<%=object.name%>" <%=object.checked%>>
-<span class="pb_checkbox_checkmark">
-  <%= object.icon %>
-</span>
-<span class="pb_checkbox_label">
-  <%= object.text %>
-</span>
-
+<%= content_tag(:label, id: object.id,
+                        data: object.data,
+                        class: object.classname) do %>
+  <input type="checkbox" value="<%=object.value%>" name="<%=object.name%>" <%= object.checked_html %>>
+  <span class="pb_checkbox_checkmark">
+    <%= pb_rails("icon", props: { icon: "check", id: "check_icon", classname: "check_icon", fixed_width: true}) if object.icon %>
+  </span>
+  <span class="pb_checkbox_label"><%= object.text %></span>
 <% end %>

data/app/pb_kits/playbook/pb_checkbox/checkbox.rb

@@ -2,93 +2,35 @@
 
 module Playbook
   module PbCheckbox
-    class Checkbox < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_data
-                 configured_id
-                 configured_dark
-                 configured_text
-                configured_value
-              configured_name
-              configured_checked
-              configured_icon
-            ].freeze
+    class Checkbox
+      include Playbook::Props
 
-      def initialize(classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     dark: default_configuration,
-                     text: default_configuration,
-                   value: default_configuration,
-                 name: default_configuration,
-                 checked: default_configuration,
-                 icon: default_configuration
-               )
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_dark = dark
-        self.configured_text = text
-        self.configured_value = value
-        self.configured_name = name
-        self.configured_checked = checked
-        self.configured_icon = icon
+      partial "pb_checkbox/checkbox"
 
-      end
-
-      def to_partial_path
-        "pb_checkbox/checkbox"
-      end
-
-      def icon
-        if is_set? configured_icon
-          pb_icon = Playbook::PbIcon::Icon.new(icon: "check", id: "check_icon", classname: "check_icon", fixed_width: true)
-          ApplicationController.renderer.render(partial: pb_icon, as: :object)
-        end
-      end
-
-      def text
-        default_value(configured_text, "")
-      end
+      prop :dark, type: Playbook::Props::Boolean, default: false
+      prop :checked, type: Playbook::Props::Boolean, default: false
+      prop :icon, type: Playbook::Props::Boolean, default: false
+      prop :text
+      prop :value
+      prop :name
 
-      def value
-        default_value(configured_value, "")
+      def checked_html
+        checked ? "checked='true'" : nil
       end
 
-      def name
-        default_value(configured_name, "")
+      def classname
+        generate_classname("pb_checkbox_kit", dark_class, checked_class)
       end
 
-      def checked
-        true_value(configured_checked, "checked='true'",nil)
-      end
+    private
 
       def checked_class
         checked ? "on" : "off"
       end
 
-
       def dark_class
-        true_value(configured_dark, "dark", nil)
-      end
-
-      def kit_class
-        caption_options = [
-          "pb_checkbox_kit",
-          dark_class,
-          checked_class
-        ]
-        caption_options.reject(&:nil?).join("_")
-      end
-
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+        dark ? "dark" : nil
       end
-      attr_accessor(*PROPS)
     end
   end
 end