playbook_ui 2.9.4 → 2.9.5

data/app/pb_kits/playbook/pb_person/_person.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname("pb_person_kit")) do %>
-      <%= object.first_name %>
-      <%= object.last_name %>
+    class: object.classname) do %>
+      <%= pb_rails("body", props: { tag: "span", classname: "pb_person_first", children: -> { object.first_name } }) %>
+      <%= pb_rails("title", props: { text: object.last_name, size: 4 }) if object.last_name %>
 <% end %>

data/app/pb_kits/playbook/pb_person/person.rb

@@ -2,55 +2,17 @@
 
 module Playbook
   module PbPerson
-    class Person < Playbook::PbKit::Base
-      PROPS = %i[
-        configured_classname
-        configured_data
-        configured_id
-        configured_first_name
-        configured_last_name
-      ].freeze
+    class Person
+      include Playbook::Props
 
-      def initialize(
-          classname: default_configuration,
-          data: default_configuration,
-          id: default_configuration,
-          first_name: default_configuration,
-          last_name: default_configuration
-        )
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_first_name = first_name
-        self.configured_last_name = last_name
-      end
-
-      def first_name
-        pb_first_name = Playbook::PbBody::Body.new(tag: "span", classname: "pb_person_first") do
-          default_value(configured_first_name, "")
-        end
-        ApplicationController.renderer.render(partial: pb_first_name, as: :object)
-      end
-
-      def last_name
-        if is_set? configured_last_name
-          pb_last_name = Playbook::PbTitle::Title.new(text: configured_last_name, size: 4)
-          ApplicationController.renderer.render(partial: pb_last_name, as: :object)
-        end
-      end
-
-      def to_partial_path
-        "pb_person/person"
-      end
+      partial "pb_person/person"
 
-    private
+      prop :first_name
+      prop :last_name
 
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_person_kit")
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_source/_source.html.erb

@@ -1,17 +1,20 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname("pb_source")) do %>
+    class: object.classname) do %>
   <div class="pb__source_layout">
-    <% if object.hide_icon == false %>
-      <%= object.type_icon %>
-      <%= object.avatar %>
+    <% if !object.hide_icon %>
+      <% if object.show_icon? %>
+        <%= pb_rails("icon_circle", props: { icon: object.type_icon_name, size: "sm" }) %>
+      <% else %>
+        <%= pb_rails("avatar", props: object.avatar) %>
+      <% end %>
     <% end %>
     <div class="pb__source_content">
-      <%= object.source %>
+      <%= pb_rails("title", props: { text: object.source, tag: "h4", size: 4 }) %>
       <div class="pb__source_value">
-        <%= object.type_text %>
-        <%= object.user_id %>
+        <%= pb_rails("body", props: { text: object.type_text, color: "light" }) %>
+        <%= pb_rails("caption", props: { text: object.user_id }) if object.user_id %>
       </div>
     </div>
   </div>

data/app/pb_kits/playbook/pb_source/source.rb

@@ -2,81 +2,44 @@
 
 module Playbook
   module PbSource
-    class Source < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_data
-                 configured_hide_icon
-                 configured_id
-                 configured_source
-                 configured_type
-                 configured_user].freeze
+    class Source
+      include Playbook::Props
 
-      def initialize(classname: default_configuration,
-                     data: default_configuration,
-                     hide_icon: default_configuration,
-                     id: default_configuration,
-                     source: default_configuration,
-                     type: default_configuration,
-                     user: default_configuration)
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_hide_icon = hide_icon
-        self.configured_id = id
-        self.configured_source = source
-        self.configured_type = type
-        self.configured_user = user
-      end
+      partial "pb_source/source"
 
-      def source
-        pb_source_title = Playbook::PbTitle::Title.new(size: 4, text: configured_source)
-        ApplicationController.renderer.render(partial: pb_source_title, as: :object)
-      end
+      prop :hide_icon, type: Playbook::Props::Boolean,
+                       default: false
+      prop :source, type: Playbook::Props::String
+      prop :type, type: Playbook::Props::Enum,
+                  values: %w[user retail inbound outbound prospecting events referral],
+                  default: "inbound"
+      prop :user, type: Playbook::Props::Hash, default: {}
 
       def type_text
-        pb_type = Playbook::PbBody::Body.new(color: "light") do
-          if type == "user" || (type == "referral" && is_set?(configured_user))
-            configured_user[:name]
-          else
-            type.titleize
-          end
+        if type == "user" || (type == "referral" && user.present?)
+          user[:name]
+        else
+          type.titleize
         end
-        ApplicationController.renderer.render(partial: pb_type, as: :object)
       end
 
-      def type_icon
-        if !type_icon_name.nil? && avatar.nil?
-          pb_type_icon = Playbook::PbIconCircle::IconCircle.new(icon: type_icon_name, size: "sm")
-          ApplicationController.renderer.render(partial: pb_type_icon, as: :object)
-        end
+      def show_icon?
+        !type_icon_name.nil? && avatar.nil?
       end
 
       def avatar
-        if is_set?(configured_user) && (type == "user" || type == "referral")
-          avatar_props = configured_user.clone
+        if user.present? && (type == "user" || type == "referral")
+          avatar_props = user.clone
           avatar_props[:size] = "sm"
           avatar_props.delete(:user_id)
-          pb_avatar = Playbook::PbAvatar::Avatar.new(avatar_props)
-          ApplicationController.renderer.render(partial: pb_avatar, as: :object)
+          avatar_props
         end
       end
 
       def user_id
-        if is_set?(configured_user) && configured_user[:user_id].present?
-          pb_user_id = Playbook::PbCaption::Caption.new(text: configured_user[:user_id])
-          ApplicationController.renderer.render(partial: pb_user_id, as: :object)
-        end
-      end
-
-      def hide_icon
-        is_true? configured_hide_icon
+        user.dig(:user_id)
       end
 
-      def to_partial_path
-        "pb_source/source"
-      end
-
-    private
-
       def type_icon_name
         case type
         when "retail"
@@ -94,17 +57,9 @@ module Playbook
         end
       end
 
-      def type
-        type_options = %w[user retail inbound outbound prospecting events referral]
-        one_of_value(configured_type, type_options, "inbound")
-      end
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_source_kit")
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_table/_table.html.erb

@@ -2,7 +2,7 @@
   <%= content_tag(:table,
       id: object.id,
       data: object.data,
-      class: object.classname(object.kit_class)) do %>
-    <%= object.yield(context: self) %>
+      class: object.classname) do %>
+    <%= capture(&object.children) %>
   <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_table/_table.jsx

@@ -16,7 +16,7 @@ const propTypes = {
 };
 
 const defaultProps = {
-  container: false,
+  container: true,
   dark: false,
   disable_hover: false,
   single_line: false,

data/app/pb_kits/playbook/pb_table/docs/_table_container.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "md", container: true}) do %>
+<%= pb_rails("table", props: { size: "md" }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_container.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableContainer() {
   return (
-    <Table container
+    <Table
         size="md"
     >
       <thead>

data/app/pb_kits/playbook/pb_table/docs/_table_container_dark.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "md", container: true, dark: true}) do %>
+<%= pb_rails("table", props: { size: "md", dark: true }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_container_dark.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableContainerDark() {
   return (
-    <Table container
+    <Table
         dark
         size="md"
     >

data/app/pb_kits/playbook/pb_table/docs/_table_dark.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "md", dark: true}) do %>
+<%= pb_rails("table", props: { size: "md", container: false, dark: true }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_dark.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableDark() {
   return (
-    <Table dark
+    <Table dark container={false}
         size="md"
     >
       <thead>

data/app/pb_kits/playbook/pb_table/docs/_table_disable_hover.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "md", disable_hover: true}) do %>
+<%= pb_rails("table", props: { size: "md", container: false, disable_hover: true }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_disable_hover.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableDisableHover() {
   return (
-    <Table disable_hover
+    <Table disable_hover container={false}
         size="md"
     >
       <thead>

data/app/pb_kits/playbook/pb_table/docs/_table_lg.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "lg"}) do %>
+<%= pb_rails("table", props: { size: "lg", container: false }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_lg.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableLg() {
   return (
-    <Table size="lg">
+    <Table size="lg" container={false}>
       <thead>
         <tr>
           <th>{`Column 1`}</th>

data/app/pb_kits/playbook/pb_table/docs/_table_md.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "md"}) do %>
+<%= pb_rails("table", props: { size: "md", container: false }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_md.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableMd() {
   return (
-    <Table size="md">
+    <Table size="md" container={false}>
       <thead>
         <tr>
           <th>{`Column 1`}</th>

data/app/pb_kits/playbook/pb_table/docs/_table_multiline.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "md"}) do %>
+<%= pb_rails("table", props: { size: "md", container: false }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_multiline.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableMultiline() {
   return (
-    <Table size="sm">
+    <Table size="sm" container={false}>
       <thead>
         <tr>
           <th>{`Column 1`}</th>

data/app/pb_kits/playbook/pb_table/docs/_table_single_line.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "md", single_line: true}) do %>
+<%= pb_rails("table", props: { size: "md", single_line: true, container: false }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_single_line.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableSingleLine() {
   return (
-    <Table single_line
+    <Table single_line container={false}
         size="sm"
     >
       <thead>

data/app/pb_kits/playbook/pb_table/docs/_table_sm.html.erb

@@ -1,4 +1,4 @@
-<%= pb_rails("table", props: {size: "sm"}) do %>
+<%= pb_rails("table", props: { size: "sm", container: false }) do %>
   <thead>
     <tr>
       <th>Column 1</th>

data/app/pb_kits/playbook/pb_table/docs/_table_sm.jsx

@@ -3,7 +3,7 @@ import {Table} from "../../"
 
 function TableSm() {
   return (
-    <Table size="sm">
+    <Table size="sm" container={false}>
       <thead>
         <tr>
           <th>{`Column 1`}</th>

data/app/pb_kits/playbook/pb_table/table.rb

@@ -2,94 +2,48 @@
 
 module Playbook
   module PbTable
-    class Table < Playbook::PbKit::Base
-      PROPS = %i[configured_aria
-                 configured_classname
-                 configured_container
-                 configured_dark
-                 configured_data
-                 configured_disable_hover
-                 configured_id
-                 configured_single_line
-                 configured_size
-                 configured_text
-                 block].freeze
-
-      def initialize(aria: default_configuration,
-                     classname: default_configuration,
-                     container: default_configuration,
-                     dark: default_configuration,
-                     data: default_configuration,
-                     disable_hover: default_configuration,
-                     id: default_configuration,
-                     single_line: default_configuration,
-                     size: default_configuration,
-                     &block)
-        self.configured_aria = aria
-        self.configured_classname = classname
-        self.configured_container = container
-        self.configured_dark = dark
-        self.configured_data = data
-        self.configured_disable_hover = disable_hover
-        self.configured_id = id
-        self.configured_single_line = single_line
-        self.configured_size = size
-        self.block = block_given? ? block : nil
+    class Table
+      include Playbook::Props
+
+      partial "pb_table/table"
+
+      prop :size, type: Playbook::Props::Enum,
+                  values: %w[sm md lg],
+                  default: "md"
+      prop :single_line, type: Playbook::Props::Boolean,
+                         default: false
+      prop :dark, type: Playbook::Props::Boolean,
+                  default: false
+      prop :disable_hover, type: Playbook::Props::Boolean,
+                           default: false
+      prop :container, type: Playbook::Props::Boolean,
+                       default: true
+      prop :text
+
+      def classname
+        generate_classname(
+          "pb_table", "table-#{size}", single_line_class, dark_class,
+          disable_hover_class, container_class, separator: " "
+        )
       end
 
-      def single_line_class
-        true_value(configured_single_line, "single-line", nil)
-      end
-
-      def size
-        size_options = %w[sm md lg]
-        one_of_value(configured_size, size_options, default_configuration)
-      end
+    private
 
-      def size_class
-        adjusted_value(configured_size, "table-#{size}", "table-md")
+      def dark_class
+        dark ? "dark" : nil
       end
 
-      def dark_class
-        true_value(configured_dark, "table-dark", nil)
+      def single_line_class
+        single_line ? "single-line" : nil
       end
 
       def disable_hover_class
-        true_value(configured_disable_hover, "no-hover", nil)
+        disable_hover ? "no-hover" : nil
       end
 
       def container_class
-        true_value(configured_container, "table-card", nil)
-      end
-
-      def kit_class
-        table_options = [
-          "pb_table",
-          size_class,
-          single_line_class,
-          dark_class,
-          disable_hover_class,
-          container_class,
-        ]
-        table_options.reject(&:nil?).join(" ")
-      end
-
-      def yield(context:)
-        context.capture(&block)
-      end
-
-      def to_partial_path
-        "pb_table/table"
-      end
-
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+        container ? "table-card" : nil
       end
-      attr_accessor(*PROPS)
     end
   end
 end