playbook_ui 2.9.6 → 2.9.7

data/app/pb_kits/playbook/pb_layout/layout.rb

@@ -2,92 +2,47 @@
 
 module Playbook
   module PbLayout
-    class Layout < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_collapse
-                 configured_dark
-                 configured_data
-                 configured_full
-                 configured_id
-                 configured_position
-                 configured_transparent
-                 configured_size
-                 block].freeze
-
-      def initialize(classname: default_configuration,
-                     collapse: default_configuration,
-                     dark: default_configuration,
-                     data: default_configuration,
-                     full: default_configuration,
-                     id: default_configuration,
-                     position: default_configuration,
-                     transparent: default_configuration,
-                     size: default_configuration,
-                     &block)
-        self.configured_classname = classname
-        self.configured_collapse = collapse
-        self.configured_dark = dark
-        self.configured_data = data
-        self.configured_full = full
-        self.configured_id = id
-        self.configured_position = position
-        self.configured_transparent = transparent
-        self.configured_size = size
-        self.block = block_given? ? block : nil
-      end
-
-      def position
-        if configured_position == default_configuration
-          "_left"
-        else
-          "_#{configured_position}"
-        end
-      end
-
-      def transparent
-        true_value(configured_transparent, "_transparent", "")
-      end
-
-      def size
-        if configured_size == default_configuration
-          "md"
-        else
-          configured_size
-        end
+    class Layout
+      include Playbook::Props
+
+      partial "pb_layout/layout"
+
+      prop :collapse, type: Playbook::Props::Enum,
+                      values: %w[xs sm md lg xl],
+                      default: "xs"
+      prop :dark, type: Playbook::Props::Boolean, default: false
+      prop :full, type: Playbook::Props::Boolean, default: false
+      prop :position, type: Playbook::Props::Enum,
+                      values: %w[left right],
+                      default: "left"
+      prop :transparent, type: Playbook::Props::Boolean, default: false
+      prop :size, type: Playbook::Props::Enum,
+                  values: %w[xs sm md lg xl],
+                  default: "md"
+
+      def classname
+        first_class = generate_classname("pb_layout", size, position, dark_class, transparent_class)
+        classname = first_class + full_class + collapse_class
+        [first_class, full_class, collapse_class].reject(&:empty?).join(" ")
       end
 
-      def collapse
-        if configured_collapse == default_configuration
-          " layout#{position}_collapse_xs"
-        else
-          " layout#{position}_collapse_#{configured_collapse}"
-        end
-      end
-
-      def full
-        true_value(configured_full, " full", "")
-      end
+    private
 
-      def dark
-        true_value(configured_dark, "_dark", "")
+      def dark_class
+        dark ? "dark" : nil
       end
 
-      def yield(context:)
-        context.capture(&block)
+      def full_class
+        full ? "full" : ""
       end
 
-      def to_partial_path
-        "pb_layout/layout"
+      def transparent_class
+        transparent ? "transparent" : nil
       end
 
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def collapse_class
+        "layout_#{position}_collapse_#{collapse}"
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_layout/sidebar.rb

@@ -2,38 +2,14 @@
 
 module Playbook
   module PbLayout
-    class Sidebar < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_data
-                 configured_id
-                 block].freeze
+    class Sidebar
+      include Playbook::Props
 
-      def initialize(classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     &block)
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.block = block_given? ? block : nil
-      end
-
-      def yield(context:)
-        context.capture(&block)
-      end
-
-      def to_partial_path
-        "pb_layout/sidebar"
-      end
-
-    private
+      partial "pb_layout/sidebar"
 
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("layout_sidebar")
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_list/_item.html.erb

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

data/app/pb_kits/playbook/pb_list/_list.html.erb

@@ -1,9 +1,8 @@
-<%= content_tag(:div,
-    class: "pb_list_kit#{object.xpadding}#{object.borderless}#{object.dark}#{object.size}#{object.layout}") do %>
-    <%= content_tag(:"#{object.ordered}",
+<%= content_tag(:div, class: object.list_classname) do %>
+  <%= content_tag(:"#{object.ordered_class}",
       id: object.id,
       data: object.data,
       class: object.classname) do %>
-      <%= object.yield(context: self) %>
+      <%= capture(&object.children) %>
   <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_list/item.rb

@@ -2,38 +2,14 @@
 
 module Playbook
   module PbList
-    class Item < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_data
-                 configured_id
-                 block].freeze
+    class Item
+      include Playbook::Props
 
-      def initialize(classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     &block)
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.block = block_given? ? block : nil
-      end
-
-      def to_partial_path
-        "pb_list/item"
-      end
-
-      def yield(context:)
-        context.capture(&block)
-      end
-
-    private
+      partial "pb_list/item"
 
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_item_kit")
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_list/list.rb

@@ -2,115 +2,66 @@
 
 module Playbook
   module PbList
-    class List < Playbook::PbKit::Base
-      PROPS = %i[configured_borderless
-                 configured_classname
-                 configured_dark
-                 configured_data
-                 configured_id
-                 configured_layout
-                 configured_size
-                 configured_ordered
-                 configured_xpadding
-                 block].freeze
+    class List
+      include Playbook::Props
 
-      def initialize(borderless: default_configuration,
-                     classname: default_configuration,
-                     dark: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     layout: default_configuration,
-                     size: default_configuration,
-                     ordered: default_configuration,
-                     xpadding: default_configuration,
-                     &block)
-        self.configured_borderless = borderless
-        self.configured_classname = classname
-        self.configured_dark = dark
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_layout = layout
-        self.configured_size = size
-        self.configured_ordered = ordered
-        self.configured_xpadding = xpadding
-        self.block = block_given? ? block : nil
-      end
+      partial "pb_list/list"
 
-      def class
-        if configured_class == default_configuration
-          ""
-        else
-          configured_class
-        end
-      end
+      prop :borderless, type: Playbook::Props::Boolean,
+                        default: false
+      prop :dark, type: Playbook::Props::Boolean,
+                  default: false
+      prop :layout, type: Playbook::Props::Enum,
+                    values: ["left", "right", ""],
+                    default: ""
+      prop :size
+      prop :ordered, type: Playbook::Props::Boolean,
+                     default: false
+      prop :xpadding, type: Playbook::Props::Boolean,
+                      default: false
 
-      def dark
-        if configured_dark == default_configuration
-          ""
-        elsif configured_dark == true
-          "_dark"
-        end
+      def list_classname
+        [
+          "pb_list_kit",
+          xpadding_class,
+          borderless_class,
+          dark_class,
+          size_class,
+          layout_class,
+        ].compact.join("_")
       end
 
-      def layout
-        if configured_layout == default_configuration
-          ""
-        elsif configured_layout == "left"
-          "_layout_left"
-        elsif configured_layout == "right"
-          "_layout_right"
-        end
+      def ordered_class
+        ordered ? "ol" : "ul"
       end
 
-      def size
-        case configured_size
-        when default_configuration
-          ""
-        when "large"
-          "_large"
-        end
-      end
+    private
 
-      def ordered
-        if configured_ordered == false
-          "ul"
-        else
-          "ol"
-        end
+      def borderless_class
+        borderless ? "borderless" : nil
       end
 
-      def xpadding
-        if configured_xpadding == default_configuration
-          ""
-        elsif configured_xpadding == true
-          "_xpadding"
-        end
+      def dark_class
+        dark ? "dark" : nil
       end
 
-      def borderless
-        if configured_borderless == false
-          ""
+      def layout_class
+        if layout == "right"
+          "layout_right"
+        elsif layout == "left"
+          "layout_left"
         else
-          "_borderless"
+          ""
         end
       end
 
-      def yield(context:)
-        context.capture(&block)
-      end
-
-      def to_partial_path
-        "pb_list/list"
+      def size_class
+        size ? "large" : nil
       end
 
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def xpadding_class
+        xpadding ? "xpadding" : nil
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_message/_message.html.erb

@@ -1,11 +1,24 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname(object.kit_class)) do %>
-    <%= object.avatar %>
+    class: object.classname) do %>
+    <% if object.valid? %>
+      <%= pb_rails("avatar", props: {
+        name: object.avatar_name,
+        size: "sm",
+        image_url: object.avatar_url,
+        status: object.avatar_status
+      }) %>
+    <% end %>
     <div class="content_wrapper">
-      <%= object.label %>
-      <%= object.message %>
-      <%= object.timestamp %>
+      <%= pb_rails("caption", props: {
+        text: object.label
+      }) %>
+      <%= pb_rails("body", props: {
+        text: object.message
+      }) %>
+      <%= pb_rails("timestamp", props: {
+        text: object.timestamp
+      }) %>
     </div>
 <% end %>

data/app/pb_kits/playbook/pb_message/docs/_message_default.html.erb

@@ -2,11 +2,9 @@
   label: "Message",
   message: "How can we assist you today?",
   timestamp: "20 seconds ago",
-  avatar: {
-    name: "Mike Bishop",
-    image: { url: "https://randomuser.me/api/portraits/men/50.jpg" },
-    status: "online"
-  }
+  avatar_name: "Mike Bishop",
+  avatar_url: "https://randomuser.me/api/portraits/men/50.jpg",
+  avatar_status: "online"
 }) %>
 
 <br><br>
@@ -15,10 +13,8 @@
   label: "Support",
   message: "We'll escalate this issue to a Senior Support agent.",
   timestamp: "9 minutes ago",
-  avatar: {
-    name: "Wade Winningham",
-    image: { url: "https://randomuser.me/api/portraits/men/14.jpg" }
-  }
+  avatar_name:"Wade Winningham",
+  avatar_url: "https://randomuser.me/api/portraits/men/14.jpg"
 }) %>
 
 <br><br>
@@ -26,10 +22,8 @@
 <%= pb_rails("message", props: {
   message: "To processs your order, I'll need your full name.",
   timestamp: "4 hours ago",
-  avatar: {
-    name: "Lisa Thompson",
-    image: { url: "https://randomuser.me/api/portraits/women/39.jpg" }
-  }
+  avatar_name: "Lisa Thompson",
+  avatar_url: "https://randomuser.me/api/portraits/women/39.jpg"
 }) %>
 
 <br><br>
@@ -37,10 +31,8 @@
 <%= pb_rails("message", props: {
   label: "Application",
   message: "Application for Kate Smith is waiting for your approval",
-  avatar: {
-    name: "Becca Jacobs",
-    image: { url: "https://randomuser.me/api/portraits/women/50.jpg" }
-  }
+  avatar_name: "Becca Jacobs",
+  avatar_url: "https://randomuser.me/api/portraits/women/50.jpg"
 }) %>
 
 <br><br>
@@ -49,9 +41,7 @@
   label: "Complaint",
   message: "We're so sorry you had a bad experience!",
   timestamp: "2 days ago",
-  avatar: {
-    name: "Tim Wenhold"
-  }
+  avatar_name: "Tim Wenhold"
 }) %>
 
 <br><br>