From ceb8c42e30bb861d204c92abb26a5ecb9548316a Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Mon, 17 Jan 2022 21:53:03 -0500
Subject: [PATCH] new implementation of PikadayInput has all tests passing

---
 jsconfig.json                                 |  5 ++
 src/components/pikaday-input2.hbs             |  1 +
 src/components/pikaday-input2.js              | 10 ++--
 src/modifiers/pikaday.js                      | 53 ++++++++++++++++---
 .../components/pikaday-input2-test.js         |  3 +-
 5 files changed, 59 insertions(+), 13 deletions(-)
 create mode 100644 jsconfig.json

diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 0000000..504cd64
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true
+  }
+}
diff --git a/src/components/pikaday-input2.hbs b/src/components/pikaday-input2.hbs
index b21fb7c..1cd74e0 100644
--- a/src/components/pikaday-input2.hbs
+++ b/src/components/pikaday-input2.hbs
@@ -1,5 +1,6 @@
 <input
   {{pikaday
+    @options
     value=this.value
     onSelect=this.onSelect
     setDefaultDate=true
diff --git a/src/components/pikaday-input2.js b/src/components/pikaday-input2.js
index 4bff083..20ab8e0 100644
--- a/src/components/pikaday-input2.js
+++ b/src/components/pikaday-input2.js
@@ -12,14 +12,12 @@ export default class extends Component {
   }
 
   get value() {
-    if (this.args.useUTC && this.args.value) {
+    let { value, useUTC } = this.args;
+    if (useUTC && value) {
       let format = 'YYYY-MM-DD';
-      return moment(
-        moment.utc(this.args.value).format(format),
-        format
-      ).toDate();
+      value = moment(moment.utc(value).format(format), format).toDate();
     }
-    return this.args.value;
+    return value;
   }
 
   get yearRange() {
diff --git a/src/modifiers/pikaday.js b/src/modifiers/pikaday.js
index 993b2af..286aac5 100644
--- a/src/modifiers/pikaday.js
+++ b/src/modifiers/pikaday.js
@@ -7,24 +7,56 @@ export default class PikadayModifier extends Modifier {
   #pikaday;
   #observer;
 
-  didInstall() {
+  get pikadayOptions() {
     let opts = {
+      // Our element is Pikaday's field
       field: this.element,
+
+      // All other named arguments go through to Pikaday
       ...this.args.named,
+
+      // We also optionally accept a bag of arguments as the first positional
+      // argument, because it's hard to do argument splatting in hbs. These are
+      // taking precedence over the named arguments.
+      ...this.args.positional[0],
     };
+
     if (!opts.i18n) {
+      // Pikaday doesn't like it if you pass an empty value for i18n, whereas
+      // it's hard in HBS to only conditionally include a named argument, so we
+      // drop it here.
       delete opts.i18n;
     }
-    this.#pikaday = new Pikaday(opts);
-    this.#pikaday.setDate(this.args.named.value, true);
+    return opts;
+  }
+
+  didInstall() {
+    this.#pikaday = new Pikaday(this.pikadayOptions);
+    let { value } = this.args.named;
+    if (value) {
+      this.#pikaday.setDate(value, true);
+    }
     this.#observer = new MutationObserver(this.sawMutation.bind(this));
     this.#observer.observe(this.element, { attributes: true });
   }
 
   didUpdateArguments() {
-    this.#pikaday.setMinDate(this.args.named.minDate);
-    this.#pikaday.setMaxDate(this.args.named.maxDate);
-    this.#pikaday.setDate(this.args.named.value, true);
+    let { value, minDate, maxDate } = this.args.named;
+    let valueAltered = false;
+    this.#pikaday.setMinDate(copyDate(minDate));
+    if (minDate && value && value < minDate) {
+      value = minDate;
+      valueAltered = true;
+    }
+
+    this.#pikaday.setMaxDate(copyDate(maxDate));
+    if (maxDate && value && value > maxDate) {
+      value = maxDate;
+      valueAltered = true;
+    }
+
+    this.#pikaday.setDate(value, !valueAltered);
+    this.#pikaday.config(this.pikadayOptions);
   }
 
   willDestroy() {
@@ -38,3 +70,12 @@ export default class PikadayModifier extends Modifier {
     }
   }
 }
+
+// apparently Pikaday mutates Dates that you pass it for minDate and maxDate. <sigh>
+function copyDate(date) {
+  if (date) {
+    return new Date(date.getTime());
+  } else {
+    return date;
+  }
+}
diff --git a/test-app/tests/integration/components/pikaday-input2-test.js b/test-app/tests/integration/components/pikaday-input2-test.js
index 7e17395..82d284c 100644
--- a/test-app/tests/integration/components/pikaday-input2-test.js
+++ b/test-app/tests/integration/components/pikaday-input2-test.js
@@ -19,7 +19,7 @@ const getDisabledDayCB = (weekendDay) => (e) => {
   return attr ? attr.value == weekendDay : false;
 };
 
-module.skip('Integration | Component | pikaday-input2', function (hooks) {
+module('Integration | Component | pikaday-input2', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it is an input tag', async function (assert) {
@@ -666,6 +666,7 @@ module.skip('Integration | Component | pikaday-input2', function (hooks) {
 
     this.set('minDate', today);
     this.set('maxDate', tomorrow);
+    await settled();
 
     assert.equal(
       today.toISOString(),