playbook_ui 7.16.0.pre.alpha2 → 8.0.0.pre.alpha1

data/app/pb_kits/playbook/pb_form/{_form_simple_form.html.erb → simple_form.html.erb}

@@ -1,8 +1,8 @@
-<%= simple_form_for *object.merged_form_system_options do |form| %>
-  <% instance_exec form, &object.children %>
+<%= simple_form_for model, options do |form| %>
+  <% instance_exec form, &children %>
 <% end %>
 
-<% if object.validate %>
+<% if validate %>
   <% content_for :pb_js do %>
     <%= javascript_tag do %>
       window.addEventListener('DOMContentLoaded', function() {

data/app/pb_kits/playbook/pb_form/simple_form.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+if defined?(SimpleForm)
+module Playbook
+  module PbForm
+    class SimpleForm < Playbook::KitBase
+      class FormBuilder < ::SimpleForm::FormBuilder
+        include ::Playbook::PbForm::FormBuilder
+
+        def input(attribute_name, options = {}, &block)
+          super(
+            attribute_name,
+            options.deep_merge(label: false, input_html: {
+                            props: {
+                              label: true,
+                            },
+                          }),
+            &block
+          )
+        end
+      end
+
+      prop :options, type: Playbook::Props::Hash, default: {}
+      prop :validate, type: Playbook::Props::Boolean, default: false
+
+      def options
+        {
+          builder: Playbook::PbForm::SimpleForm::FormBuilder,
+          html: html_options,
+          data: data,
+          url: "",
+        }.merge(prop(:options))
+      end
+
+      def model
+        prop(:options).fetch(:model, nil)
+      end
+
+      def data
+        prop(:data).merge("pb-form-validation" => validate)
+      end
+
+      def classname
+        [generate_classname("pb-form"), html[:class]].join(" ")
+      end
+
+      def html
+        prop(:options).fetch(:html, {})
+      end
+
+      def render_in(view_context, &_block)
+        super(view_context, &nil)
+      end
+
+    private
+
+      def html_options
+        html.merge(class: classname)
+      end
+    end
+  end
+end
+end

data/app/pb_kits/playbook/pb_layout/{_item.html.erb → item.html.erb}

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

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

@@ -2,11 +2,7 @@
 
 module Playbook
   module PbLayout
-    class Item
-      include Playbook::Props
-
-      partial "pb_layout/item"
-
+    class Item < Playbook::KitBase
       prop :size, type: Playbook::Props::Enum,
                   values: %w[sm md lg],
                   default: "sm"

data/app/pb_kits/playbook/pb_typeahead/typeahead.rb

@@ -40,6 +40,7 @@ module Playbook
           id: id,
           isMulti: true,
           label: label,
+          name: name,
           options: options,
           placeholder: placeholder,
         }

data/lib/playbook.rb

@@ -10,6 +10,7 @@ require "playbook/props"
 require "playbook/version"
 require "playbook/pb_kit_helper"
 require "playbook/kit_base"
+require "playbook/kit_resolver"
 require "playbook/markdown/template_handler"
 require "playbook/engine" if defined?(Rails)
 

data/lib/playbook/classnames.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Playbook
+  module Classnames
+    def self.included(base)
+      base.prop :classname
+      base.prop :dark, type: Playbook::Props::Boolean, default: false
+    end
+
+    def generate_classname(*name_parts, separator: "_")
+      [
+        name_parts.compact.join(separator),
+        prop(:classname),
+        spacing_props,
+        dark_props,
+        max_width_props,
+        z_index_props,
+      ].compact.join(" ")
+    end
+
+    def generate_classname_without_spacing(*name_parts, separator: "_")
+      [
+        name_parts.compact.join(separator),
+        prop(:classname),
+      ].compact.join(" ")
+    end
+
+  private
+
+    def dark_props
+      dark ? "dark" : nil
+    end
+  end
+end

data/lib/playbook/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "sassc-rails"
 require "slim-rails"
 
@@ -13,18 +14,11 @@ module Playbook
     config.view_component.render_monkey_patch_enabled = false
 
     config.assets.paths ||= []
-    config.assets.paths << "#{Gem.loaded_specs['playbook_ui'].full_gem_path}/fonts"
-    config.assets.paths << "#{Gem.loaded_specs['playbook_ui'].full_gem_path}/app/pb_kits/playbook/pb_*"
+    config.assets.paths << Playbook::Engine.root.join("fonts")
+    config.assets.paths << Playbook::Engine.root.join("app/pb_kits/playbook/pb_*")
 
     config.sass.load_paths ||= []
-    config.sass.load_paths << "#{Gem.loaded_specs['playbook_ui'].full_gem_path}/app/pb_kits/playbook"
-
-    initializer "playbook_ui.add_view_paths", after: :add_view_paths do |_app|
-      ActiveSupport.on_load(:action_controller) do
-        append_view_path "#{Gem.loaded_specs['playbook_ui'].full_gem_path}/app/pb_kits/playbook"
-        append_view_path "#{Gem.loaded_specs['playbook_ui'].full_gem_path}/app/pb_kits/playbook/config"
-      end
-    end
+    config.sass.load_paths << Playbook::Engine.root.join("app/pb_kits/playbook")
 
     initializer "webpacker.proxy" do |app|
       insert_middleware = begin

data/lib/playbook/kit_base.rb

@@ -1,9 +1,21 @@
 # frozen_string_literal: true
 
+require "playbook/classnames"
+require "playbook/spacing"
+require "playbook/z_index"
+
 module Playbook
   class KitBase < ViewComponent::Base
-    include Playbook::Props
     include Playbook::PbKitHelper
+    include Playbook::Props
+    include Playbook::Classnames
+    include Playbook::Spacing
+    include Playbook::ZIndex
+
+    prop :id
+    prop :data, type: Playbook::Props::Hash, default: {}
+    prop :aria, type: Playbook::Props::Hash, default: {}
+    prop :children, type: Playbook::Props::Proc
 
     def object
       self

data/lib/playbook/kit_resolver.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Playbook
+  class KitResolver
+    def self.resolve(*args)
+      @resolver ||= new
+      @resolver.resolve(*args)
+    end
+
+    def initialize
+      @cache = Hash.new do |cache, kit_name|
+        is_subkit = kit_name.match(%r{[/\\]})
+        folder = is_subkit ? kit_name.split("/")[0] : kit_name
+        item = is_subkit ? kit_name.split("/")[-1] : kit_name
+        @cache[kit_name] = "Playbook::Pb#{folder.camelize}::#{item.camelize}"
+      end
+    end
+
+    def resolve(kit_name)
+      @cache[kit_name].safe_constantize
+    end
+  end
+end

data/lib/playbook/pb_kit_helper.rb

@@ -2,30 +2,9 @@
 
 module Playbook
   module PbKitHelper
-    def pb_rails(kit, props: {}, &block)
-      previous = prefix_partial_path_with_controller_namespace
-      self.prefix_partial_path_with_controller_namespace = false
-      kit = build_view_model(kit.to_s, props, &block)
-      if kit.is_a?(Playbook::KitBase)
-        render_component kit, &block
-      else
-        render(partial: kit, as: :object)
-      end
-    ensure
-      self.prefix_partial_path_with_controller_namespace = previous
-    end
-
-  private
-
-    def is_subkit?(kit)
-      kit.match(%r{[/\\]})
-    end
-
-    def build_view_model(kit, props, &block)
-      folder = is_subkit?(kit) ? kit.split("/")[0] : kit
-      item = is_subkit?(kit) ? kit.split("/")[-1] : kit
-      class_name = "Playbook::Pb#{folder.camelize}::#{item.camelize}"
-      class_name.safe_constantize.new(props, &block)
+    def pb_rails(kit_name, props: {}, &block)
+      kit = Playbook::KitResolver.resolve(kit_name.to_s)
+      render_component kit.new(props, &block), &block
     end
   end
 end

data/lib/playbook/props.rb

@@ -22,6 +22,9 @@ module Playbook
   module Props
     extend ActiveSupport::Concern
 
+    attr_accessor :values
+    private :values, :values=
+
     def initialize(prop_values = {}, &block)
       self.values = { children: block }.merge(Hash(prop_values))
       self.class.props.each do |key, definition|
@@ -33,129 +36,11 @@ module Playbook
       self.class.props[name].value values[name]
     end
 
-    def spacing_props
-      selected_props = spacing_options.keys.select { |sk| try(sk) }
-      return nil unless selected_props.present?
-
-      selected_props.map do |k|
-        spacing_value = send(k)
-        "#{spacing_options[k]}_#{spacing_value}" if spacing_values.include? spacing_value
-      end.compact.join(" ")
-    end
-
-    def dark_props
-      dark ? "dark" : nil
-    end
-
-    def max_width_props
-      selected_mw_props = max_width_options.keys.select { |sk| try(sk) }
-      return nil unless selected_mw_props.present?
-
-      selected_mw_props.map do |k|
-        width_value = send(k)
-        "max_width_#{width_value}" if max_width_values.include? width_value
-      end.compact.join(" ")
-    end
-
-    def z_index_props
-      selected_index_props = z_index_options.keys.select { |sk| try(sk) }
-      return nil unless selected_index_props.present?
-
-      selected_index_props.map do |k|
-        index_value = send(k)
-        "z_index_#{index_value}" if z_index_values.include? index_value
-      end.compact.join(" ")
-    end
-
-    def generate_classname(*name_parts, separator: "_")
-      [
-        name_parts.compact.join(separator),
-        prop(:classname),
-        spacing_props,
-        dark_props,
-        max_width_props,
-        z_index_props,
-      ].compact.join(" ")
-    end
-
-    def generate_classname_without_spacing(*name_parts, separator: "_")
-      [
-        name_parts.compact.join(separator),
-        prop(:classname),
-      ].compact.join(" ")
-    end
-
     attr_accessor :values
     private :values, :values=
 
     included do
       class_attribute :props, default: {}
-
-      prop :id
-      prop :data, type: Playbook::Props::Hash, default: {}
-      prop :classname
-      prop :aria, type: Playbook::Props::Hash, default: {}
-      prop :children, type: Playbook::Props::Proc
-      prop :margin
-      prop :margin_bottom
-      prop :margin_left
-      prop :margin_right
-      prop :margin_top
-      prop :margin_x
-      prop :margin_y
-      prop :max_width
-      prop :padding
-      prop :padding_bottom
-      prop :padding_left
-      prop :padding_right
-      prop :padding_top
-      prop :padding_x
-      prop :padding_y
-      prop :dark, type: Playbook::Props::Boolean, default: false
-      prop :z_index
-    end
-
-    def spacing_options
-      {
-        margin: "m",
-        margin_bottom: "mb",
-        margin_left: "ml",
-        margin_right: "mr",
-        margin_top: "mt",
-        margin_x: "mx",
-        margin_y: "my",
-        padding: "p",
-        padding_bottom: "pb",
-        padding_left: "pl",
-        padding_right: "pr",
-        padding_top: "pt",
-        padding_x: "px",
-        padding_y: "py",
-      }
-    end
-
-    def max_width_options
-      {
-        max_width: "mw",
-      }
-    end
-
-    def max_width_values
-      %w[sm md lg xl]
-    end
-
-    def z_index_options
-      {
-        z_index: "z-index",
-      }
-    end
-
-    def z_index_values
-      %w[1 2 3 4 5 6 7 8 9 10]
-    end
-
-    def spacing_values
-      %w[none xs sm md lg xl]
     end
 
     class_methods do

data/lib/playbook/spacing.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Playbook
+  module Spacing
+    def self.included(base)
+      base.prop :margin
+      base.prop :margin_bottom
+      base.prop :margin_left
+      base.prop :margin_right
+      base.prop :margin_top
+      base.prop :margin_x
+      base.prop :margin_y
+      base.prop :max_width
+      base.prop :padding
+      base.prop :padding_bottom
+      base.prop :padding_left
+      base.prop :padding_right
+      base.prop :padding_top
+      base.prop :padding_x
+      base.prop :padding_y
+    end
+
+    def spacing_options
+      {
+        margin: "m",
+        margin_bottom: "mb",
+        margin_left: "ml",
+        margin_right: "mr",
+        margin_top: "mt",
+        margin_x: "mx",
+        margin_y: "my",
+        padding: "p",
+        padding_bottom: "pb",
+        padding_left: "pl",
+        padding_right: "pr",
+        padding_top: "pt",
+        padding_x: "px",
+        padding_y: "py",
+      }
+    end
+
+    def spacing_values
+      %w[none xs sm md lg xl]
+    end
+
+    def spacing_props
+      selected_props = spacing_options.keys.select { |sk| try(sk) }
+      return nil unless selected_props.present?
+
+      selected_props.map do |k|
+        spacing_value = send(k)
+        "#{spacing_options[k]}_#{spacing_value}" if spacing_values.include? spacing_value
+      end.compact.join(" ")
+    end
+
+    def max_width_props
+      selected_mw_props = max_width_options.keys.select { |sk| try(sk) }
+      return nil unless selected_mw_props.present?
+
+      selected_mw_props.map do |k|
+        width_value = send(k)
+        "max_width_#{width_value}" if max_width_values.include? width_value
+      end.compact.join(" ")
+    end
+
+    def max_width_options
+      {
+        max_width: "mw",
+      }
+    end
+
+    def max_width_values
+      %w[sm md lg xl]
+    end
+  end
+end