playbook_ui 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf9b3f5c473d741e312f2688e16d3aad2f37b6a18c4dd11bf878dd538ab11199
-  data.tar.gz: 3cd322faca0eba26a65c5e84277d9691f301bd116d95d9bdefab56c50c699c80
+  metadata.gz: 25e534d853cf741d99d4409bad4b63fae3c01e5367a94b84ba4a37c598c95417
+  data.tar.gz: 40d42989c78e9926e7e68cbe60212563fd4922ef5308f86def18d03ddff71cdd
 SHA512:
-  metadata.gz: a98eec496b2a72d53fd4d7e590ef9e86aa0b18fc66d019b50d18733b774952746f06bda29c30ffcdfffb1ec715460cb3fe6ed529f5e647063a7891352ee17805
-  data.tar.gz: 8afa59cc9e0f784b0267ef52f83597b4f097a413a0a819f623a24ec2da2ebb1eaa2619aa237788b76c738d76cf600397b82624f0f96d54e3e31b153acbc68dc5
+  metadata.gz: 9a551ebc7c39683e38b31a74a6452518da6433a548468d4ae83f78bb0642db278d262918f91c07b29a98983f60ba6032ed302993984e5c7deda1b1da68749b8c
+  data.tar.gz: 9a78ee36e72c2469c5c442aefdf04dd907cd708d534fb17267ed035284d9ed79026e113906d5185fe2afdb3e0eee73e20932150c170baf5e234d7d06797cbc25

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

@@ -21,7 +21,7 @@ module Playbook
         prepend(DatePickerField)
 
         def actions(&block)
-          @template.render_component ActionArea.new(submit_default_value: submit_default_value), &block
+          @template.render_component ActionArea.new(submit_default_value: submit_default_value, children: block)
         end
       end
     end

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

@@ -1,3 +1,3 @@
 <ol class="pb-form-actions">
-    <%= content %>
+  <%= instance_exec(self, &children) %>
 </ol>

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/lib/playbook/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Playbook
-  VERSION = "8.0.0"
+  VERSION = "8.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playbook_ui
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.1
 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-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -955,7 +955,6 @@ 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

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
-  })
-%>