chore(flatpickr): fix usage of flatpickr

projectcaluma · Jan 23, 2024 · a2657ba · a2657ba
1 parent 812894e
commit a2657ba
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 17 deletions.
diff --git a/packages/-ember-caluma/package.json b/packages/-ember-caluma/package.json
@@ -68,6 +68,7 @@
     "ember-truth-helpers": "4.0.3",
     "ember-uikit": "9.0.0",
     "ember-validated-form": "7.0.0",
+    "flatpickr": "4.6.13",
     "graphql": "15.8.0",
     "loader.js": "4.7.0",
     "miragejs": "0.1.48",

diff --git a/packages/distribution/package.json b/packages/distribution/package.json
@@ -37,6 +37,7 @@
     "ember-svg-jar": "^2.4.7",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^9.0.0",
+    "flatpickr": "^4.6.13",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "lodash.merge": "^4.6.2",

diff --git a/packages/form-builder/package.json b/packages/form-builder/package.json
@@ -42,6 +42,7 @@
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^9.0.0",
     "ember-validated-form": "^7.0.0",
+    "flatpickr": "^4.6.13",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "highlight.js": "^11.9.0",

diff --git a/packages/form/addon/components/cf-field/input/date.hbs b/packages/form/addon/components/cf-field/input/date.hbs
@@ -15,7 +15,7 @@
     class="uk-input {{if @disabled 'uk-disabled'}}"
     readonly={{@disabled}}
     @disabled={{@disabled}}
-    @locale={{this.locale}}
+    @locale={{this.localeObject}}
     @date={{or @field.answer.value null}}
     @altFormat={{this.dateFormat}}
     @altInput={{true}}

diff --git a/packages/form/addon/components/cf-field/input/date.js b/packages/form/addon/components/cf-field/input/date.js
@@ -3,6 +3,7 @@ import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
+import lang from "flatpickr/dist/l10n";
 import { DateTime } from "luxon";
 
 export default class CfFieldInputDateComponent extends Component {
@@ -14,6 +15,10 @@ export default class CfFieldInputDateComponent extends Component {
     return this.intl.primaryLocale.split("-")[0];
   }
 
+  get localeObject() {
+    return lang[this.locale];
+  }
+
   get config() {
     return getOwner(this).resolveRegistration("config:environment");
   }

diff --git a/packages/form/app/styles/_flatpickr.scss b/packages/form/app/styles/_flatpickr.scss
@@ -1,4 +1,6 @@
 @use "sass:color";
+@import "flatpickr/dist/flatpickr";
+@import "flatpickr/dist/themes/airbnb";
 
 $flatpickr-today-color: $global-warning-background;
 $flatpickr-selected-color: $global-primary-background;

diff --git a/packages/form/index.js b/packages/form/index.js
@@ -2,16 +2,4 @@
 
 module.exports = {
   name: require("./package").name,
-
-  included(...args) {
-    const app = this._findHost(this);
-
-    app.options.flatpickr = {
-      locales: ["de", "fr"],
-      theme: "airbnb",
-      ...(app.options.flatpickr ?? {}),
-    };
-
-    this._super.included.apply(this, args);
-  },
 };
diff --git a/packages/form/package.json b/packages/form/package.json
@@ -38,6 +38,7 @@
     "ember-truth-helpers": "^4.0.3",
     "ember-uikit": "^9.0.0",
     "ember-validators": "^4.1.2",
+    "flatpickr": "^4.6.13",
     "graphql": "^15.8.0",
     "jexl": "^2.3.0",
     "lodash.isequal": "^4.5.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml