playbook_ui 6.1.0.pre.alpha2 → 6.1.0.pre.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fecf67eb41f40f4f0d7ea55a6022bec483a5aacd6d41a5c1b45a7c81412b73ab
-  data.tar.gz: f3eb88406378a85f4041fba412ffbf8da0ab01fe6bf15d56aae7db985d6115bd
+  metadata.gz: 5b5f0ebf353807848145db1debca6c328dc6c22d75a3a9895f36fa6d0dd5a718
+  data.tar.gz: ec48bd6d3874cb9324adb62458aa523c50c3e66a6231e4d7bc3822c76eb2e281
 SHA512:
-  metadata.gz: ec43cb89ba4c4da27ee725978b8ad975e6afbef7b5c267172e64765f820d8c01b9aaf9dc09d1cde312ae190a76282ecd0213d0eef4c9efdd1e1a043b0e6e4f07
-  data.tar.gz: 79d5075f7d55aa9774bc9acd6733bdf369a90d526df9958d972d1c6ddedb8ff283cf7b5a15ab051207cbd8bdff5717ea4e48d7c3c9a1491501ab8347e8e76d88
+  metadata.gz: 46fbf75023b2a972d37fa053ae549733887defe7f78475418d58c891839ef1997517091c5b1bebcb413667f986588759612ca8febd50fd3d1197d7ffa7ed3b81
+  data.tar.gz: 90c0f1dda08fdd629c1c36412dff45028934b2d4ac608d5d94836bb6595d541c30c450837087493888c501de987fa14e51469c24ffc427e977bba67a1146b744

data/app/pb_kits/playbook/_playbook.scss

@@ -15,7 +15,6 @@
 @import 'pb_currency/currency';
 @import 'pb_dashboard_value/dashboard_value';
 @import 'pb_date/date';
-@import 'pb_date_picker/date_picker';
 @import 'pb_date_range_inline/date_range_inline';
 @import 'pb_date_range_stacked/date_range_stacked';
 @import 'pb_date_stacked/date_stacked';

data/app/pb_kits/playbook/data/menu.yml

@@ -26,7 +26,6 @@ kits:
   - fixed_confirmation_toast
   - flex
   - forms:
-    - date_picker
     - file_upload
     - form
     - form_pill

data/app/pb_kits/playbook/index.js

@@ -14,7 +14,6 @@ export Contact from './pb_contact/_contact.jsx'
 export Currency from './pb_currency/_currency.jsx'
 export DashboardValue from './pb_dashboard_value/_dashboard_value.jsx'
 export Date from './pb_date/_date.jsx'
-export DatePicker from './pb_date_picker/_date_picker.jsx'
 export DateRangeInline from './pb_date_range_inline/_date_range_inline.jsx'
 export DateRangeStacked from './pb_date_range_stacked/_date_range_stacked.jsx'
 export DateStacked from './pb_date_stacked/_date_stacked.jsx'
@@ -92,7 +91,6 @@ export dashboardValueSettings from './pb_dashboard_value/dashboardValueSettings'
 
 // Other JS/Plugins
 export pbChart from './plugins/pb_chart.js'
-export datePickerHelper from './pb_date_picker/date_picker_helper.js'
 export PbTypeahead from './pb_typeahead'
 export PbPopover from './pb_popover'
 export PbTable from './pb_table'

data/app/pb_kits/playbook/packs/examples.js

@@ -28,7 +28,6 @@ import * as Contact from 'pb_contact/docs'
 import * as Currency from 'pb_currency/docs'
 import * as DashboardValue from 'pb_dashboard_value/docs'
 import * as Date from 'pb_date/docs'
-import * as DatePicker from 'pb_date_picker/docs'
 import * as DateRangeInline from 'pb_date_range_inline/docs'
 import * as DateRangeStacked from 'pb_date_range_stacked/docs'
 import * as DateStacked from 'pb_date_stacked/docs'
@@ -109,7 +108,6 @@ WebpackerReact.setup({
   ...Currency,
   ...DashboardValue,
   ...Date,
-  ...DatePicker,
   ...DateRangeInline,
   ...DateRangeStacked,
   ...DateStacked,

data/app/pb_kits/playbook/pb_checkbox/_checkbox.html.erb

@@ -11,6 +11,6 @@
       <%= pb_rails("icon", props: { icon: "check", id: "check_icon", classname: "check_icon", fixed_width: true}) %>
     </span>
     <span class="pb_checkbox_label">
-      <%= pb_rails("body", props: { status: object.checkbox_label_status, text: object.text, dark: object.dark }) %>
+      <%= pb_rails("body", props: { status: object.checkbox_label_status, text: object.text, dark: object.dark, margin_right: object.form_spacing ? "xs" : "" }) %>
     </span>
 <% end %>

data/app/pb_kits/playbook/pb_checkbox/checkbox.rb

@@ -15,6 +15,11 @@ module Playbook
       prop :value
       prop :name
 
+      prop :required, type: Playbook::Props::Boolean,
+                      default: false
+      prop :form_spacing, type: Playbook::Props::Boolean,
+                          default: false
+
       def checked_html
         checked ? "checked='true'" : nil
       end

data/app/pb_kits/playbook/pb_filter/docs/_filter_default.html.erb

@@ -27,10 +27,13 @@
       OpenStruct.new(name: "Georgia", value: 10),
     ]
   %>
-  <%= pb_rails("form", props: { form_system_options: { scope: :blahblah, method: :get } }) do |form| %>
-    <%= form.text_field :example_text_field, props: { label: true } %>
-    <%= form.collection_select :example_collection_select, example_collection, :value, :name, props: { label: true } %>
-    <%= form.date_picker :example_date_picker %>
+  <%= pb_rails("form", props: { form_system_options: { scope: :example, method: :get } }) do |form| %>
+    <%# <%= form.text_field :example_text_field, props: { label: true } %>
+    <%# <%= form.collection_select :example_collection_select, example_collection, :value, :name, props: { label: true } %>
+    <%= pb_rails("caption", props: { text: "Status", margin_bottom: "sm" }) %>
+    <%= form.check_box :example_checkbox, props: { text: "Delivered", margin_right: "md" } %>
+    <%= form.check_box :example_checkbox, props: { text: "Unsubscribed", margin_right: "md" } %>
+    <%= form.check_box :example_checkbox, props: { text: "Failed", margin_right: "md" } %>
 
     <%= form.actions do |action| %>
       <%= action.submit props: { text: "Apply", data: { disable_with: "<i class='far fa-spinner fa-spin mr-3'></i>Searching...".html_safe },}%>

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

@@ -13,7 +13,7 @@
   ]
 %>
 
-<%= pb_rails("form", props: { form_system_options: { scope: :scope, method: :get } }) do |form| %>
+<%= pb_rails("form", props: { form_system_options: { scope: :example, method: :get } }) do |form| %>
   <%= form.text_field :example_text_field, props: { label: true } %>
   <%= form.telephone_field :example_phone_field, props: { label: true } %>
   <%= form.email_field :example_email_field, props: { label: true } %>
@@ -24,7 +24,7 @@
   <%= form.text_area :example_text_area, props: { label: true } %>
   <%= form.select :example_select, [ ["Yes", 1], ["No", 2] ], props: { label: true } %>
   <%= form.collection_select :example_collection_select, example_collection, :value, :name, props: { label: true } %>
-  <%= form.date_picker :example_date_picker1, props: { default_date: 'blank' } %>
+  <%= form.check_box :example_checkbox, data: { field1: "value1", field2: "value2" }, props: { text: "Example Checkbox", label: true, value: "test-val" } %>
 
   <%= form.actions do |action| %>
     <%= action.submit %>

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

@@ -14,7 +14,7 @@
 %>
 
 <%= pb_rails("form", props: {
-    form_system_options: { scope: :scope, method: :get },
+    form_system_options: { scope: :example, method: :get },
     validate: true
   }) do |form| %>
   <%= form.text_field :example_text_field, props: { label: true, required: true } %>
@@ -27,7 +27,7 @@
   <%= form.text_area :example_text_area, props: { label: true, required: true } %>
   <%= form.select :example_select, [ ["Yes", 1], ["No", 2] ], props: { label: true, blank_selection: "Select One...", required: true } %>
   <%= form.collection_select :example_collection_select, example_collection, :value, :name, props: { label: true, blank_selection: "Select One...", required: true } %>
-  <%= form.date_picker :example_date_picker2, props: { default_date: 'blank' } %>
+  <%= form.check_box :example_checkbox, props: { text: "Example Checkbox", label: true, required: true } %>
 
   <%= form.actions do |action| %>
     <%= action.submit %>

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

@@ -14,7 +14,7 @@
     :example_text_area,
     :example_select_field,
     :example_collection_select_field,
-    :example_date_picker_field
+    :example_checkbox_field
 
 
     def self.model_name
@@ -50,7 +50,7 @@
   <%= form.input :example_text_area, as: :text %>
   <%= form.select :example_select_field, [["Yes", 1], ["No", 2]], props: { label: true } %>
   <%= form.collection_select :example_collection_select_field, example_collection, :value, :name, props: { label: true } %>
-  <%= form.date_picker :example_date_picker_field, props: { default_date: 'blank', } %>
+  <%= form.check_box :example_checkbox_field, props: { text: "Example Checkbox", label: true } %>
 
   <%= form.actions do |action| %>
     <%= action.submit %>

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

@@ -14,7 +14,7 @@
     :example_text_area,
     :example_select_field,
     :example_collection_select_field,
-    :example_date_picker_field
+    :example_checkbox_field
 
 
     def self.model_name
@@ -50,7 +50,7 @@
   <%= form.input :example_text_area, {as: :text, input_html: {props: {required: true}}} %>
   <%= form.select :example_select_field, [["Yes", 1], ["No", 2]], props: { required: true, blank_selection: "Select One...", label: true } %>
   <%= form.collection_select :example_collection_select_field, example_collection, :value, :name, props: { required: true, blank_selection: "Select One...", label: true } %>
-  <%= form.date_picker :example_date_picker_field, props: { default_date: 'blank', required: true } %>
+  <%= form.check_box :example_checkbox_field, props: { text: "Example Checkbox", label: true, required: true } %>
 
   <%= form.actions do |action| %>
     <%= action.submit %>

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

@@ -14,10 +14,11 @@ module Playbook
         prepend(FormFieldBuilder.new(:password_field, kit_name: "text_input"))
         prepend(FormFieldBuilder.new(:url_field, kit_name: "text_input"))
         prepend(FormFieldBuilder.new(:text_area, kit_name: "textarea"))
+        # prepend(FormFieldBuilder.new(:check_box, kit_name: "checkbox"))
         prepend(TypeaheadField)
         prepend(SelectField)
         prepend(CollectionSelectField)
-        prepend(DatePickerField)
+        prepend(CheckboxField)
 
         def actions(&block)
           ActionArea.new(self).wrapper(&block)

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Playbook
+  module PbForm
+    module FormBuilder
+      module CheckboxField
+        def check_box(name, data: {}, props: {})
+          value = props[:value] ||= 1
+          input = super(name, { required: props[:required], data: data }, value)
+          label_text = name.to_s.gsub("_", " ")
+
+          props[:margin_bottom] = "sm"
+          props[:form_spacing] = true
+
+          # Refactor and dry up, solve adding nil error
+          if props[:label]
+            @template.pb_rails("caption", props: { text: label_text, margin_bottom: "xs" }) +
+              @template.pb_rails("checkbox", props: props) do
+                input
+              end
+          else
+            @template.pb_rails("checkbox", props: props) do
+              input
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Playbook
             options[:skip_default_ids] = false unless options.key?(:skip_default_ids)
             options[:required] = true if props[:required]
             options[:placeholder] = props[:placeholder] || ""
+            options[:value] = props[:value]
 
             if props.key?(:validation)
               validation = props[:validation]

data/app/pb_kits/playbook/vendor.js

@@ -5,10 +5,6 @@ window.pbChart = pbChart
 // Forms
 import './pb_form/pb_form_validation'
 
-// Date Picker
-import datePickerHelper from './pb_date_picker/date_picker_helper.js'
-window.datePickerHelper = datePickerHelper
-
 // Lazy image loading
 import 'lazysizes'
 
@@ -23,5 +19,3 @@ PbTypeahead.start()
 
 import PbTable from './pb_table'
 PbTable.start()
-
-import 'flatpickr'

data/lib/playbook/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Playbook
-  VERSION = "6.1.0.pre.alpha2"
+  VERSION = "6.1.0.pre.alpha3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playbook_ui
 version: !ruby/object:Gem::Version
-  version: 6.1.0.pre.alpha2
+  version: 6.1.0.pre.alpha3
 platform: ruby
 authors:
 - Power UX
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -680,29 +680,6 @@ files:
 - app/pb_kits/playbook/pb_date/docs/_description.md
 - app/pb_kits/playbook/pb_date/docs/example.yml
 - app/pb_kits/playbook/pb_date/docs/index.js
-- app/pb_kits/playbook/pb_date_picker/_date_picker.html.erb
-- app/pb_kits/playbook/pb_date_picker/_date_picker.jsx
-- app/pb_kits/playbook/pb_date_picker/_date_picker.scss
-- app/pb_kits/playbook/pb_date_picker/date_picker.rb
-- app/pb_kits/playbook/pb_date_picker/date_picker_helper.js
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_default.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_default.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_default_date.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_default_date.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_disabled.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_disabled.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_error.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_error.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_format.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_format.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_label.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_label.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_min_max.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_min_max.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_range.html.erb
-- app/pb_kits/playbook/pb_date_picker/docs/_date_picker_range.jsx
-- app/pb_kits/playbook/pb_date_picker/docs/example.yml
-- app/pb_kits/playbook/pb_date_picker/docs/index.js
 - app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.html.erb
 - app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.jsx
 - app/pb_kits/playbook/pb_date_range_inline/_date_range_inline.scss
@@ -867,8 +844,8 @@ files:
 - app/pb_kits/playbook/pb_form/form/simple_form_form.rb
 - app/pb_kits/playbook/pb_form/form_builder.rb
 - 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
-- app/pb_kits/playbook/pb_form/form_builder/date_picker_field.rb
 - app/pb_kits/playbook/pb_form/form_builder/form_field_builder.rb
 - app/pb_kits/playbook/pb_form/form_builder/form_with_form_builder.rb
 - app/pb_kits/playbook/pb_form/form_builder/select_field.rb

data/app/pb_kits/playbook/pb_date_picker/_date_picker.html.erb

@@ -1,38 +0,0 @@
-<%= content_tag(:div,
-    aria: object.aria,
-    class: object.classname + " " + object.error_class,
-    data: object.data,
-    id: object.id) do %>
-    <%= pb_rails("caption", props: { text: object.label }) %>
-      <div class="input_wrapper">
-        <input
-            autocomplete="off"
-            id="<%= object.picker_id %>"
-            name="<%= object.name %>"
-            <%= object.required ? required="required" : ''%>
-        />
-        <% if object.error %>
-          <%= pb_rails("body", props: { 
-            status: "negative",
-            text: object.error
-          }) %>
-        <% end %>
-      </div>
-
-      <%= javascript_tag do %>
-      document.addEventListener("DOMContentLoaded", () => {
-          datePickerHelper({
-            defaultDate: "<%= object.default_date %>",
-            disableDate: <%=raw object.disable_date %>,
-            disableRange: <%=raw object.disable_range.to_json %>,
-            disableWeekdays: <%=raw object.disable_weekdays %>,
-            format: "<%= object.format %>",
-            maxDate: "<%= object.max_date %>",
-            minDate: "<%= object.min_date %>",
-            mode: "<%= object.mode %>",
-            pickerId: "<%= object.picker_id %>",
-            propModel: "rails"
-          })
-      })
-      <% end %>
-<% end %>

data/app/pb_kits/playbook/pb_date_picker/_date_picker.jsx

@@ -1,101 +0,0 @@
-/* @flow */
-
-import React, { useEffect } from 'react'
-import classnames from 'classnames'
-import { buildAriaProps, buildCss, buildDataProps } from '../utilities/props'
-import { globalProps } from '../utilities/globalProps.js'
-// import flatpickr from 'flatpickr'
-import { Body, Caption } from '../'
-import datePickerHelper from './date_picker_helper.js'
-
-type DatePickerProps = {
-  aria?: object,
-  className?: String,
-  data?: object,
-  defaultDate?: String,
-  disableDate?: Array,
-  disableRange?: Array,
-  disableWeekdays?: Array,
-  error?: String,
-  format?: String,
-  id?: String,
-  label?: String,
-  maxDate: String,
-  minDate: String,
-  mode?: String,
-  name: String,
-  pickerId?: String,
-}
-const DatePicker = (props: DatePickerProps) => {
-  const {
-    aria = {},
-    className,
-    data = {},
-    defaultDate = '',
-    disableDate = null,
-    disableRange = null,
-    disableWeekdays = null,
-    error,
-    format = 'm/d/Y',
-    id,
-    label = 'Date Picker',
-    maxDate,
-    minDate,
-    mode = 'single',
-    name,
-    pickerId,
-  } = props
-
-  const ariaProps = buildAriaProps(aria)
-  const dataProps = buildDataProps(data)
-  const classes = classnames(
-    buildCss('pb_date_picker_kit'),
-    className,
-    globalProps(props),
-    error ? 'error' : null,
-  )
-
-  useEffect(() => {
-    datePickerHelper({
-      defaultDate: defaultDate,
-      disableDate: disableDate,
-      disableRange: disableRange,
-      disableWeekdays: disableWeekdays,
-      format: format,
-      maxDate: maxDate,
-      minDate: minDate,
-      mode: mode,
-      pickerId: pickerId,
-      propModel: 'React',
-    })
-  }, [])
-
-  return (
-    <div
-        {...ariaProps}
-        {...dataProps}
-        className={classes}
-        id={id}
-    >
-      {className}
-      <Caption
-          text={label}
-      />
-      <div className="input_wrapper">
-        <input
-            autoComplete="off"
-            id={pickerId}
-            name={name}
-        />
-        <If condition={error}>
-          <Body
-              status="negative"
-              text={error}
-          />
-        </If>
-      </div>
-    </div>
-  )
-}
-
-export default DatePicker