playbook_ui 7.0.0.pre.alpha14 → 7.0.0.pre.alpha15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 972b3bf2414f87c7f6374f5eff1a0b2de27d145d7394399c13d30d6a96e293ca
-  data.tar.gz: 850d50a56e852f315630cd3d9180db0e655607b76a0c6f5cf04a84f601b431b3
+  metadata.gz: 748e8b8bd2267aeeebe8fa55a3ca6bb5404fbd8d4133b80b22c7bb37217ff9b8
+  data.tar.gz: 011e14d3bf83bdba2ac94c9c719ab0b31ad026616df14c9e79cb0ae62ab932f6
 SHA512:
-  metadata.gz: 607c7ef165b2d71d6279dc73c159a1326a56c1fafd4b41446bd6b8cd22d49d4ebffbb24e1f339a2b32ddd2559663fa7bc9b51eb8ca7cd5b0b3a8e6231f787773
-  data.tar.gz: b9351d4c6df7546eb39ae5742546d3c44e699005ffa6da44c8af1d1e256412e69a95ec208f986bd6619434a1647b7f17bd9f88e4b872556b11d6f57e1ddff568
+  metadata.gz: 6962424a2fdb0aafedda050a5dd2620b614107e6744631bd2f36d1be3065f6a27c76e11ceb20261ae2f47ecbcfc35cdaddd3a50cb9441afdf9819a116d3b2682
+  data.tar.gz: 9201beceb3d221d4af35cdf45fffc49fa66c289ded941774ee80bc5bd5876e138cd608b99a0d9a6700bc79e9ab1ed25b90aa27c4d8f4ec4e1d017419f7757b50

data/app/pb_kits/playbook/pb_date_picker/date_picker_helper.js

@@ -16,6 +16,7 @@ const datePickerHelper = (config) => {
     required,
     yearRange,
   } = config
+
   // ===========================================================
   // |                   Hook Definitions                      |
   // ===========================================================
@@ -48,6 +49,7 @@ const datePickerHelper = (config) => {
       parentInput.style.justifyContent = ''
     }
   }
+
   // ===========================================================
   // |             Flatpickr initializer w/ config             |
   // ===========================================================
@@ -98,6 +100,7 @@ const datePickerHelper = (config) => {
     prevArrow: '<i class="far fa-angle-left"></i>',
     static: true,
   })
+
   // ===========================================================
   //                 Additional JS Functionality               |
   // ===========================================================
@@ -115,7 +118,7 @@ const datePickerHelper = (config) => {
     years += `<option value="${year}">${year}</option>`
   }
 
-  // variablize each dropdown selecttor
+  // variablize each dropdown selector
   const dropdown = document.querySelector(`#year-${pickerId}`)
 
   // inject year options into dropdown and assign it the flatpickr's current year value
@@ -127,98 +130,21 @@ const datePickerHelper = (config) => {
     picker.changeYear(Number(e.target.value))
   })
 
-  // Allow the date picker form resetting
+  // Reverse month and year dropdown reset on form.reset()
   if (picker.input.form) {
-    // let adaptive = false
-    // const adaptedReset = (e) => {
-    //   picker.input.form.removeEventListener('reset', namedFunc)
-    //   debugger
-    //   e.target.reset()
-    //   picker.input.form.addEventListener('reset', namedFunc)
-    //   picker.monthsDropdownContainer.value = picker.currentMonth
-    //   dropdown.value = picker.currentYear
-    // }
-
-    // const namedFunc = (e) => {
-    //   e.preventDefault()
-    //   debugger
-    //   adaptedReset(e)
-    // }
-
-    // picker.input.form.addEventListener('reset', namedFunc)
-
-    // const myAsync = async() => {
-    //   console.log('reset')
-    //   return 'arb'
-    // }
-
-    // const promise = new Promise((resolve) => {
-    //   picker.input.form.addEventListener('reset', () => console.log('reset'))
-    //   resolve('chyeah')
-    // })
-
-    // promise.then((val) => {
-    //   console.log('select cleanup', val)
-    //   picker.monthsDropdownContainer.value = picker.currentMonth
-    //   dropdown.value = picker.currentYear
-    // })
-
-    picker.input.form.addEventListener('reset', (e) => {
+    picker.input.form.addEventListener('reset', () => {
+      // Code block triggers after form.reset() is called and executed
       setTimeout(() => {
         dropdown.value = picker.currentYear
         picker.monthsDropdownContainer.value = picker.currentMonth
+
+        /* Reset date picker to default value on form.reset() */
+        if (defaultDate){
+          picker.setDate(defaultDate)
+          yearChangeHook()
+        }
       }, 0)
     })
-
-  //   picker.input.form.addEventListener('reset', (e) => {
-  //     // debugger
-  //     // adaptedReset(e.target)
-  //     // e.preventDefault()
-  //     // debugger
-  //     // e.target.reset()
-  //     // debugger
-
-  //     // const manualReset = async() => {
-  //     //   e.target.reset()
-  //     //   debugger
-  //     //   return 'test-val'
-  //     // }
-
-  //     // const resetSelects = async() => {
-  //     //   const arb = await manualReset()
-  //     //   console.log(arb)
-  //     //   debugger
-  //     //   picker.monthsDropdownContainer.value = picker.currentMonth
-  //     //   dropdown.value = picker.currentYear
-  //     // }
-
-  //     // e.preventDefault()
-  //     // if (defaultDate){
-  //     //   picker.setDate(defaultDate)
-  //     //   yearChangeHook()
-  //     // } else {
-  //     //   picker.clear()
-  //     // }
-
-  //     // const fields = e.target.querySelectorAll('select, input, textarea')
-
-  //     // // Prevent year and month dropdowns from being reset
-  //     // fields.forEach((field) => {
-  //     //   if (field == picker.monthsDropdownContainer || field == dropdown || field == picker.input){
-  //     //     // console.log(field)
-  //     //     return
-  //     //   } else {
-  //     //     field.value = field.defaultValue
-  //     //   }
-  //     // })
-  //     // debugger
-  //     // setTimeout(() => {
-  //     //   dropdown.value = picker.currentYear
-  //     //   picker.monthsDropdownContainer.value = picker.currentMonth
-  //     //   console.log(picker)
-  //     //   debugger
-  //     // }, 10)
-  //   })
   }
 
   // two way binding

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

@@ -30,7 +30,6 @@
   <%= 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 } %>
-    <%= form.date_picker :test_id, props: { label: true, default_date: "10/02/1993" }%>
 
     <%= 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/form_builder/date_picker_field.rb

@@ -8,7 +8,7 @@ module Playbook
           prefix = @object_name
           html_attribute_name = "#{prefix}[#{name}]"
           html_id = "#{prefix}_#{name}"
-          props[:label] = @template.label(@object_name, name) if props[:label] && !props[:label].is_a?(String)
+          props[:label] = @template.label(@object_name, name) if props[:label] == true
 
           props[:name] = html_attribute_name
           props[:picker_id] = html_id

data/lib/playbook/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Playbook
-  VERSION = "7.0.0.pre.alpha14"
+  VERSION = "7.0.0.pre.alpha15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playbook_ui
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre.alpha14
+  version: 7.0.0.pre.alpha15
 platform: ruby
 authors:
 - Power UX
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack