playbook_ui 8.0.0.pre.alpha4 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '061590a33e32cccf2c0a6b1f434921d84723d0bcbbdbbc088fd3b5f3d13cb978'
-  data.tar.gz: '01921feae3d387c46af5f4c9e05121df1808fddaa37f18c842fcb61d68efd33b'
+  metadata.gz: ba4203db09f20dc8904716f5920b8d0664ecbb7520939dcabb853cd0879ac6b4
+  data.tar.gz: 0ee8e4ae7924af54ee7998407b6f30d9f55020e1d4df2a8d8987ab02e912080e
 SHA512:
-  metadata.gz: 05f0cc3aed39dda97c7bff82f2630b05b26242623ea00848f0b0efd327dccd1087cd95ddda329a78ded17139ec7c4e715dec853b485da79d0f1a9dbeac978656
-  data.tar.gz: ba4974ce61c5a6b1f56f3bb3aae34cc63000dd22db441d2387c506e5c924947013575840e36cecab9272d731cd4a1337d25d4e8944d5520037a085b644a24af6
+  metadata.gz: c8afdb091c129aaaf7e6df96c88c8b526067b88f38094a5371fe249dac3017f43c37e9bb5fbca7f484a423fc993ce81861c892411ae926fca2b839092a3bd592
+  data.tar.gz: 9403b804db36c8ada5bae70b336bd37c8903c3c6b6493d0888318daf7a38f7e4b4b7d6b00a2f5c66c02ae45790f33017de2f2a5e58524cf3e7c518a3413446a1

data/app/pb_kits/playbook/pb_form/_form.scss

@@ -1,8 +1,12 @@
 .pb-form {
   .pb-form-actions {
     list-style: none;
-    margin: 8px;
+    margin: 0;
     padding: 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    flex-direction: row;
 
     > li {
       display: inline-flex;

data/app/pb_kits/playbook/pb_form/docs/_form_form_with_validate.html.erb

@@ -13,8 +13,8 @@
   ]
 %>
 
-<%= pb_rails("form", props: {
-    form_system_options: { scope: :example, method: :get, url: "" },
+<%= pb_rails("form/form_with", props: {
+    scope: :example, method: :get, url: "",
     validate: true
   }) do |form| %>
   <%= form.text_field :example_text_field, props: { label: true, required: true } %>

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

@@ -19,8 +19,17 @@ module Playbook
         end
       end
 
-      def render_in(view_context, &_block)
-        super(view_context, &nil)
+      def render_in(view_context, &block)
+        form_kit.render_in(view_context, &block)
+      end
+
+    private
+
+      def form_kit
+        @form_system ||= begin
+          ::Playbook::KitResolver.resolve("form/#{form_system}")
+                                 .new(options: form_system_options, validate: validate, children: children)
+        end
       end
     end
   end

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

@@ -19,9 +19,11 @@ module Playbook
         prepend(CollectionSelectField)
         prepend(CheckboxField)
         prepend(DatePickerField)
+      end
 
-        def actions(&block)
-          @template.render_component ActionArea.new(submit_default_value: submit_default_value), &block
+      def actions
+        @template.send(:view_context).content_tag :ol, class: "pb-form-actions" do
+          yield ActionArea.new(@template, submit_default_value)
         end
       end
     end

data/app/pb_kits/playbook/pb_form/form_builder/action_area.rb

@@ -3,22 +3,29 @@
 module Playbook
   module PbForm
     module FormBuilder
-      class ActionArea < Playbook::KitBase
-        prop :submit_default_value, type: Playbook::Props::String
+      class ActionArea
+        def initialize(view_context, submit_default_value)
+          self.view_context = view_context
+          self.submit_default_value = submit_default_value
+        end
 
         def submit(value = nil, props: {})
           props[:type] ||= "submit"
+          props[:text] ||= value || submit_default_value
+
           button(value, props: props)
         end
 
         def button(value = nil, props:)
-          props[:text] ||= value || submit_default_value
-
-          content_tag(:li) do
-            pb_rails("button", props: props)
+          view_context.content_tag(:li) do
+            view_context.pb_rails("button", props: props)
           end
         end
+
+      private
+
+        attr_accessor :view_context, :submit_default_value
       end
     end
   end
-end
+end

data/app/pb_kits/playbook/pb_form/form_with.html.erb

@@ -1,18 +1,11 @@
-<%= form_with(id: id,
-              aria: aria,
-              class: classname,
-              data: data,
-              builder: form_builder,
-              **options) do |form| %>
-  <% instance_exec form, &children %>
+<%= form_with(form_options, &method(:render_form)) %>
 
-  <% if validate %>
-    <% content_for :pb_js do %>
-      <%= javascript_tag do %>
-        window.addEventListener('DOMContentLoaded', function() {
-          PbFormValidation.start()
-        })
-      <% end %>
+<% if validate %>
+  <% content_for :pb_js do %>
+    <%= javascript_tag do %>
+      window.addEventListener('DOMContentLoaded', function() {
+        PbFormValidation.start()
+      })
     <% end %>
   <% end %>
 <% end %>

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

@@ -14,16 +14,23 @@ module Playbook
         prop(:data).merge("pb-form-validation" => validate)
       end
 
-      def options
-        { url: "" }.merge(Hash(prop(:options)))
+      def form_options
+        {
+          url: "",
+          id: id,
+          aria: aria,
+          class: classname,
+          data: data,
+          builder: ::Playbook::PbForm::FormWith::FormBuilder,
+        }.merge(options)
       end
 
-      def classname
-        [generate_classname("pb-form"), options[:class]].join(" ")
+      def render_form(builder)
+        view_context.capture(builder, &children)
       end
 
-      def form_builder
-        ::Playbook::PbForm::FormWith::FormBuilder
+      def classname
+        [generate_classname("pb-form"), options[:class]].join(" ")
       end
 
       def render_in(view_context, &_block)

data/app/pb_kits/playbook/pb_form/simple_form.html.erb

@@ -1,6 +1,4 @@
-<%= simple_form_for model, options do |form| %>
-  <% instance_exec form, &children %>
-<% end %>
+<%= simple_form_for model, options, &method(:render_form) %>
 
 <% if validate %>
   <% content_for :pb_js do %>
@@ -10,4 +8,4 @@
       })
     <% end %>
   <% end %>
-<% end %>
+<% end %>

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

@@ -48,6 +48,10 @@ module Playbook
         prop(:options).fetch(:html, {})
       end
 
+      def render_form(builder)
+        view_context.capture(builder, &children)
+      end
+
       def render_in(view_context, &_block)
         super(view_context, &nil)
       end

data/app/pb_kits/playbook/pb_user_badge/_user_badge.jsx

@@ -23,7 +23,7 @@ const UserBadge = (props: UserBadgeProps) => {
     size = 'md',
   } = props
 
-  const image = require(`./badges/_${badge}.svg`)
+  const image = require(`./badges/${badge}.svg`)
   const ariaProps = buildAriaProps(aria)
   const dataProps = buildDataProps(data)
   const classes = classnames(

data/lib/playbook/pb_doc_helper.rb

@@ -21,6 +21,10 @@ module Playbook
       end.join.yield_self(&method(:raw))
     end
 
+    def nav_hash_array(link)
+      link.first.last
+    end
+
     # Deal with lists of kits, used in Playbook doc and Externally
     def pb_kits(type: "rails", limit_examples: false, dark_mode: false)
       display_kits = []

data/lib/playbook/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Playbook
-  VERSION = "8.0.0.pre.alpha4"
+  VERSION = "8.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playbook_ui
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre.alpha4
+  version: 8.0.3
 platform: ruby
 authors:
 - Power UX
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -955,10 +955,8 @@ files:
 - app/pb_kits/playbook/pb_form/docs/_form_simple_form_validate.html.erb
 - app/pb_kits/playbook/pb_form/docs/_form_simple_form_validate.md
 - app/pb_kits/playbook/pb_form/docs/example.yml
-- app/pb_kits/playbook/pb_form/form.html.erb
 - app/pb_kits/playbook/pb_form/form.rb
 - app/pb_kits/playbook/pb_form/form_builder.rb
-- app/pb_kits/playbook/pb_form/form_builder/action_area.html.erb
 - app/pb_kits/playbook/pb_form/form_builder/action_area.rb
 - app/pb_kits/playbook/pb_form/form_builder/checkbox_field.rb
 - app/pb_kits/playbook/pb_form/form_builder/collection_select_field.rb
@@ -2057,9 +2055,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.7.3

data/app/pb_kits/playbook/pb_form/form.html.erb

@@ -1,7 +0,0 @@
-<%=
-  pb_rails("form/#{form_system}", props: {
-    options: form_system_options,
-    children: children,
-    validate: validate
-  })
-%>

data/app/pb_kits/playbook/pb_form/form_builder/action_area.html.erb

@@ -1,3 +0,0 @@
-<ol class="pb-form-actions">
-    <%= content %>
-</ol>