playbook_ui 8.1.0 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde6450a7a9b834c1c16de60363a43d58a9f28da53ca2aa0089d8d96ec9ea89d
-  data.tar.gz: 4a067f64e965d58c3d12d23a8303d3e51482063d001c89693206bbea86ae952f
+  metadata.gz: cf65024f9c8b665dbaf812a6edb823980369c31096dce9f2a8b7366bd1e356fe
+  data.tar.gz: a4b0829b8c93af718c147cc32ce79e3f0e93904cf127760590d1a80d1daa17fe
 SHA512:
-  metadata.gz: 42b92e641da9e7e5b1611bed31240d3a08934d7c6b612195407d92ab3c0b3bcbe3a13c1ebbd9e21f3d00c65f7e13f0198e5a2180edbc2dfa4e2048ad6e6f10a0
-  data.tar.gz: 8e9d47f263458035522e390cd25b90183c556cdbca33a7a910a76ffadf711760cafe970382759191909ff6ef44427649aa52d32100c6d452dc69ed850d7eedb2
+  metadata.gz: f15ae3e8bb2b6b4bcaa77d614bdc2c74f6ec452ffd6bdc4ff5bbff1514ed65bf179f86d26684164765faea5429a2520aa6f2f5e604c48282fe8f7448b7b223f7
+  data.tar.gz: e45bf19780479f6a23f917006e8f188c58db8d523e6737caf7718ab3b2d054ff64c86d7924f863a01293ae535b87a18cf68ea5bbee7ed5d6ac999054e835d7bd

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playbook_ui
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.1.1
 platform: ruby
 authors:
 - Power UX
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -973,7 +973,6 @@ files:
 - app/pb_kits/playbook/pb_form/docs/example.yml
 - 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

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

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