RubyGems - playbook_ui - Versions diffs - 2.9.4 → 2.9.5 - Mend

playbook_ui 2.9.4 → 2.9.5

Files changed (64) hide show

data/app/pb_kits/playbook/pb_home_address_street/_home_address_street.html.erb CHANGED Viewed

@@ -17,7 +17,7 @@
   <%= pb_rails "body", props: {
     color: "light",
-    text: object.city_state,
+    text: object.city_state_zip,
   } %>
   <%= pb_rails "body", props: { classname: "home-hashtag", tag: "span" } do %>
@@ -25,7 +25,7 @@
   <% end %>
   <%= pb_rails "body", props: { color: "light", tag: "span" } do %>
-    <small><%= object.state %></small>
+    <small><%= object.territory %></small>
   <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_home_address_street/_home_address_street.jsx CHANGED Viewed

@@ -9,8 +9,15 @@ import {
   Title,
 } from '../'
+const dot = (houseStyle) =>
+  { if (houseStyle !== undefined) {
+    return "\u00b7"
+  }
+}
 type HomeAddressStreetProps = {
   address: String,
+  address_cont: String,
   city: String,
   className?: String,
   dark?: Boolean,
@@ -18,6 +25,7 @@ type HomeAddressStreetProps = {
   houseStyle: String,
   state: String,
   zipcode: String,
+  territory: String,
 }
 const classes = (className, dark) => (
@@ -27,8 +35,10 @@ const classes = (className, dark) => (
   })
 )
 const HomeAddressStreet = ({
   address,
+  address_cont,
   city,
   className,
   dark=false,
@@ -36,16 +46,23 @@ const HomeAddressStreet = ({
   houseStyle,
   state,
   zipcode,
+  territory,
 }: HomeAddressStreetProps) => (
   <div className={classes(className, dark)}>
     <Title
         className="pb_home_address_street_address"
         size={4}
     >
-      {address} {`\u00b7`} {houseStyle}
+      {address} {dot(houseStyle)} {houseStyle}
+    </Title>
+    <Title
+        className="pb_home_address_street_address"
+        size={4}
+    >
+      {address_cont}
     </Title>
     <Body color="light">
-      {city}, {state}
+      {city}, {state} {zipcode}
     </Body>
     <Body
         className="home-hashtag"
@@ -57,7 +74,7 @@ const HomeAddressStreet = ({
         color="light"
         tag="span"
     >
-      <small>{state}</small>
+      <small>{territory}</small>
     </Body>
   </div>
 )

data/app/pb_kits/playbook/pb_home_address_street/docs/_home_address_street_dark.html.erb CHANGED Viewed

@@ -1,10 +1,11 @@
 <%= pb_rails("home_address_street", props: {
   address: "70 Prospect Ave",
-  address2: "Apt M18",
-  city: "North Arlington",
+  address_cont: "Apt M18",
+  city: "West Chester",
   home_id: 8250263,
-  house_style: nil,
-  state: "NJ",
-  zipcode: "07031",
+  house_style: "Colonial",
+  state: "PA",
+  zipcode: "19382",
+  territory: "PHL",
   dark: true,
 }) %>

data/app/pb_kits/playbook/pb_home_address_street/docs/_home_address_street_dark.jsx CHANGED Viewed

@@ -5,12 +5,13 @@ function HomeAddressStreetDark() {
   return (
     <HomeAddressStreet
         address="70 Prospect Ave"
-        city="North Arlington"
+        address_cont="Apt M18"
+        city="West Chester"
         dark
         homeId={8250263}
-        houseStyle="Colonial"
-        state="NJ"
-        zipcode="07031"
+        state="PA"
+        zipcode="19382"
+        territory="PHL"
     />
   )
 }

data/app/pb_kits/playbook/pb_home_address_street/docs/_home_address_street_default.html.erb CHANGED Viewed

@@ -1,9 +1,10 @@
 <%= pb_rails("home_address_street", props: {
   address: "70 Prospect Ave",
-  address2: nil,
-  city: "North Arlington",
+  address_cont: "Apt M18",
+  city: "West Chester",
   home_id: 8250263,
   house_style: "Colonial",
-  state: "NJ",
-  zipcode: "07031",
+  state: "PA",
+  zipcode: "19382",
+  territory: "PHL",
 }) %>

data/app/pb_kits/playbook/pb_home_address_street/docs/_home_address_street_default.jsx CHANGED Viewed

@@ -5,11 +5,13 @@ function HomeAddressStreetDefault() {
   return (
     <HomeAddressStreet
         address="70 Prospect Ave"
-        city="North Arlington"
+        address_cont="Apt M18"
+        city="West Chester"
         homeId={8250263}
         houseStyle="Colonial"
-        state="NJ"
-        zipcode="07031"
+        state="PA"
+        zipcode="19382"
+        territory="PHL"
     />
   )
 }

data/app/pb_kits/playbook/pb_home_address_street/docs/_home_address_street_modified.html.erb ADDED Viewed

@@ -0,0 +1,8 @@
+<%= pb_rails("home_address_street", props: {
+  address: "70 Prospect Ave",
+  city: "West Chester",
+  home_id: 8250263,
+  state: "PA",
+  zipcode: "19382",
+  territory: "PHL",
+}) %>

data/app/pb_kits/playbook/pb_home_address_street/docs/_home_address_street_modified.jsx ADDED Viewed

@@ -0,0 +1,17 @@
+import React from "react"
+import {HomeAddressStreet} from "../../"
+function HomeAddressStreetModified() {
+  return (
+    <HomeAddressStreet
+        address="70 Prospect Ave"
+        city="West Chester"
+        homeId={8250263}
+        state="PA"
+        zipcode="19382"
+        territory="PHL"
+    />
+  )
+}
+export default HomeAddressStreetModified;

data/app/pb_kits/playbook/pb_home_address_street/docs/example.yml CHANGED Viewed

@@ -2,10 +2,12 @@ examples:
   rails:
   - home_address_street_default: Default
+  - home_address_street_modified: Modified
   - home_address_street_dark: Dark
   react:
   - home_address_street_default: Default
+  - home_address_street_modified: Modified
   - home_address_street_dark: Dark

data/app/pb_kits/playbook/pb_home_address_street/docs/index.js CHANGED Viewed

@@ -1,2 +1,3 @@
 export {default as HomeAddressStreetDefault} from './_home_address_street_default.jsx';
+export {default as HomeAddressStreetModified} from './_home_address_street_modified.jsx';
 export {default as HomeAddressStreetDark} from './_home_address_street_dark.jsx';

data/app/pb_kits/playbook/pb_home_address_street/home_address_street.rb CHANGED Viewed

@@ -8,20 +8,21 @@ module Playbook
       partial "pb_home_address_street/home_address_street"
       prop :address
-      prop :address2
+      prop :address_cont
       prop :city
       prop :home_id, type: Playbook::Props::Number
       prop :house_style
       prop :state
       prop :zipcode
+      prop :territory
       prop :dark, type: Playbook::Props::Boolean, default: false
       def classname
         generate_classname("pb_home_address_street_kit", dark_class)
       end
-      def city_state
-        "#{city}, #{state}"
+      def city_state_zip
+        "#{city}, #{state} #{zipcode}"
       end
       def address_house_style
@@ -29,7 +30,7 @@ module Playbook
       end
       def address_house_style2
-        address2
+        address_cont
       end
       def separator

data/app/pb_kits/playbook/pb_icon_circle/_icon_circle.html.erb CHANGED Viewed

@@ -1,6 +1,6 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname(object.kit_class)) do %>
-  <%= object.icon %>
+    class: object.classname) do %>
+  <%= pb_rails("icon", props: { icon: object.icon, fixed_width: true }) %>
 <% end %>

data/app/pb_kits/playbook/pb_icon_circle/icon_circle.rb CHANGED Viewed

@@ -2,66 +2,22 @@
 module Playbook
   module PbIconCircle
-    class IconCircle < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_data
-                 configured_icon
-                 configured_id
-                 configured_size
-                 configured_variant].freeze
+    class IconCircle
+      include Playbook::Props
-      def initialize(classname: default_configuration,
-                     data: default_configuration,
-                     icon: default_configuration,
-                     id: default_configuration,
-                     size: default_configuration,
-                     variant: default_configuration)
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_icon = icon
-        self.configured_id = id
-        self.configured_size = size
-        self.configured_variant = variant
-      end
-      def icon
-        if is_set? configured_icon
-          pb_icon = Playbook::PbIcon::Icon.new(icon: configured_icon, fixed_width: true)
-          ApplicationController.renderer.render(partial: pb_icon, as: :object)
-        end
-      end
+      partial "pb_icon_circle/icon_circle"
-      def kit_class
-        kit_options = [
-          "pb_icon_circle_kit",
-          size,
-          variant,
-        ]
-        kit_options.join("_")
-      end
-      def to_partial_path
-        "pb_icon_circle/icon_circle"
-      end
-    private
-      def size
-        size_options = %w[xs sm md base lg xl]
-        one_of_value(configured_size, size_options, "md")
-      end
-      def variant
-        variant_options = %w[default royal blue purple teal red yellow green]
-        one_of_value(configured_variant, variant_options, "default")
-      end
+      prop :icon, required: true
+      prop :size, type: Playbook::Props::Enum,
+                  values: %w[xs sm md base lg xl],
+                  default: "md"
+      prop :variant, type: Playbook::Props::Enum,
+                     values: %w[default royal blue purple teal red yellow green],
+                     default: "default"
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_icon_circle_kit", size, variant)
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_icon_value/_icon_value.html.erb CHANGED Viewed

@@ -1,6 +1,9 @@
 <%= content_tag(:div,
-    id: object.id,
-    data: object.data,
-    class: object.classname(object.kit_class)) do %>
-  <%= object.value %>
+  id: object.id,
+  data: object.data,
+  class: object.classname) do %>
+    <%= pb_rails("body", props: { color: "light" }) do %>
+      <%= pb_rails("icon", props: { icon: object.icon, fixed_width: true }) %>
+      <%= object.text %>
+    <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_icon_value/icon_value.rb CHANGED Viewed

@@ -2,77 +2,20 @@
 module Playbook
   module PbIconValue
-    class IconValue < Playbook::PbKit::Base
-      PROPS = %i[configured_align
-                 configured_classname
-                 configured_data
-                 configured_icon
-                 configured_id
-                 configured_text].freeze
+    class IconValue
+      include Playbook::Props
-      def initialize(align: default_configuration,
-                     classname: default_configuration,
-                     data: default_configuration,
-                     icon: default_configuration,
-                     id: default_configuration,
-                     text: default_configuration)
-        self.configured_align = align
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_icon = icon
-        self.configured_id = id
-        self.configured_text = text
-      end
-      def value
-        if is_set? configured_text
-          pb_icon_value = Playbook::PbBody::Body.new(color: "light") do
-            icon +
-              text
-          end
-          ApplicationController.renderer.render(partial: pb_icon_value, as: :object)
-        end
-      end
-      def kit_class
-        kit_options = [
-          "pb_icon_value_kit",
-          align,
-        ]
-        kit_options.compact.join("_")
-      end
-      def to_partial_path
-        "pb_icon_value/icon_value"
-      end
+      partial "pb_icon_value/icon_value"
-    private
-      def align
-        align_options = %w[left center right]
-        one_of_value(configured_align, align_options, "left")
-      end
-      def icon
-        if is_set? configured_icon
-          icon_props = { icon: configured_icon, fixed_width: true }
-          pb_icon = Playbook::PbIcon::Icon.new(icon_props)
-          ApplicationController.renderer.render(partial: pb_icon, as: :object)
-        else
-          ""
-        end
-      end
-      def text
-        default_value(configured_text, "")
-      end
+      prop :text, required: true
+      prop :icon, required: true
+      prop :align, type: Playbook::Props::Enum,
+                   values: %w[left center right],
+                   default: "left"
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_icon_value_kit", align)
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_image/_image.html.erb CHANGED Viewed

@@ -1,6 +1,6 @@
 <%= tag(:img,
     id: object.id,
-    data: object.data(src: object.url),
-    class: object.classname(object.kit_class),
+    data: object.data.merge(src: object.url),
+    class: object.classname,
     aria: object.aria,
     alt: object.alt) %>

data/app/pb_kits/playbook/pb_image/image.rb CHANGED Viewed

@@ -2,58 +2,17 @@
 module Playbook
   module PbImage
-    class Image < Playbook::PbKit::Base
-      PROPS = %i[configured_alt
-                 configured_aria
-                 configured_classname
-                 configured_data
-                 configured_id
-                 configured_url].freeze
+    class Image
+      include Playbook::Props
-      def initialize(alt: default_configuration,
-                     aria: default_configuration,
-                     classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     url: default_configuration)
-        self.configured_alt = alt
-        self.configured_aria = aria
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_url = url
-      end
-      def alt
-        default_value(configured_alt, "")
-      end
-      def url
-        default_value(configured_url, "")
-      end
-      def kit_class
-        image_options = %w[
-          pb_image_kit
-          lazyload
-          blur_up
-        ]
-        image_options.reject(&:nil?).join(" ")
-      end
-      def to_partial_path
-        "pb_image/image"
-      end
+      partial "pb_image/image"
-    private
+      prop :alt
+      prop :url
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_image_kit lazyload blur_up")
       end
-      attr_reader(*PROPS)
-      attr_accessor(*PROPS)
     end
   end
 end