From 580371e4c13f6e17c21a68c648a941e9f5c96266 Mon Sep 17 00:00:00 2001 From: Jonas Metzener Date: Mon, 18 Mar 2024 12:45:35 +0100 Subject: [PATCH] fix(form): only pass locale string to flatpickr --- packages/-ember-caluma/package.json | 2 +- packages/distribution/package.json | 2 +- packages/form-builder/package.json | 2 +- .../addon/components/cf-field/input/date.hbs | 2 +- .../addon/components/cf-field/input/date.js | 5 -- packages/form/package.json | 2 +- .../components/cf-field/input/date-test.js | 50 ++++++++----------- pnpm-lock.yaml | 24 ++++----- 8 files changed, 39 insertions(+), 50 deletions(-) diff --git a/packages/-ember-caluma/package.json b/packages/-ember-caluma/package.json index c24c75e26..cdd22fe52 100644 --- a/packages/-ember-caluma/package.json +++ b/packages/-ember-caluma/package.json @@ -56,7 +56,7 @@ "ember-engines": "0.9.0", "ember-engines-router-service": "0.5.1", "ember-fetch": "8.1.2", - "ember-flatpickr": "7.1.0", + "ember-flatpickr": "8.0.0", "ember-intl": "6.5.3", "ember-load-initializers": "2.1.2", "ember-math-helpers": "4.0.0", diff --git a/packages/distribution/package.json b/packages/distribution/package.json index 10646c629..4a973acaa 100644 --- a/packages/distribution/package.json +++ b/packages/distribution/package.json @@ -31,7 +31,7 @@ "ember-concurrency": "^4.0.1", "ember-engines-router-service": "^0.5.1", "ember-fetch": "^8.1.2", - "ember-flatpickr": "^7.1.0", + "ember-flatpickr": "^8.0.0", "ember-intl": "^6.5.3", "ember-svg-jar": "^2.4.9", "ember-test-selectors": "^6.0.0", diff --git a/packages/form-builder/package.json b/packages/form-builder/package.json index 06f3474a0..dd9292d98 100644 --- a/packages/form-builder/package.json +++ b/packages/form-builder/package.json @@ -34,7 +34,7 @@ "ember-concurrency": "^4.0.1", "ember-engines-router-service": "^0.5.1", "ember-fetch": "^8.1.2", - "ember-flatpickr": "^7.1.0", + "ember-flatpickr": "^8.0.0", "ember-intl": "^6.5.3", "ember-math-helpers": "^4.0.0", "ember-power-select": "^7.2.0", diff --git a/packages/form/addon/components/cf-field/input/date.hbs b/packages/form/addon/components/cf-field/input/date.hbs index 129ed9e46..42f47b893 100644 --- 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.localeObject}} + @locale={{this.locale}} @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 index 70058c92a..eda90aa3c 100644 --- a/packages/form/addon/components/cf-field/input/date.js +++ b/packages/form/addon/components/cf-field/input/date.js @@ -3,7 +3,6 @@ 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 { @@ -15,10 +14,6 @@ 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/package.json b/packages/form/package.json index 8aa53940d..0239dedfc 100644 --- a/packages/form/package.json +++ b/packages/form/package.json @@ -29,7 +29,7 @@ "ember-composable-helpers": "^5.0.0", "ember-concurrency": "^4.0.1", "ember-fetch": "^8.1.2", - "ember-flatpickr": "^7.1.0", + "ember-flatpickr": "^8.0.0", "ember-in-viewport": "^4.1.0", "ember-intl": "^6.5.3", "ember-math-helpers": "^4.0.0", diff --git a/packages/form/tests/integration/components/cf-field/input/date-test.js b/packages/form/tests/integration/components/cf-field/input/date-test.js index 407782068..b8e92c3a7 100644 --- a/packages/form/tests/integration/components/cf-field/input/date-test.js +++ b/packages/form/tests/integration/components/cf-field/input/date-test.js @@ -1,4 +1,4 @@ -import { fillIn, blur, render } from "@ember/test-helpers"; +import { fillIn, blur, render, waitFor } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { setFlatpickrDate } from "ember-flatpickr/test-support/helpers"; import { setupIntl, setLocale } from "ember-intl/test-support"; @@ -51,17 +51,17 @@ module("Integration | Component | cf-field/input/date", function (hooks) { hbs``, ); + await waitFor(".ember-flatpickr-input.input"); + + assert.dom(".ember-flatpickr-input.input").hasAttribute("type", "text"); + assert.dom(".ember-flatpickr-input.input").hasValue("10.09.2021"); assert - .dom(".ember-flatpickr-input:not([type='hidden'])") - .hasAttribute("type", "text"); - assert - .dom(".ember-flatpickr-input:not([type='hidden'])") - .hasValue("10.09.2021"); - assert - .dom(".ember-flatpickr-input[type='hidden']") + .dom(".ember-flatpickr-input.flatpickr-input") .hasAttribute("readonly"); - assert.dom(".ember-flatpickr-input[type='hidden']").hasClass("uk-disabled"); - assert.dom(".ember-flatpickr-input[type='hidden']").hasValue("2021-09-10"); + assert + .dom(".ember-flatpickr-input.flatpickr-input") + .hasClass("uk-disabled"); + assert.dom(".ember-flatpickr-input.flatpickr-input").hasValue("2021-09-10"); }); test("it works on input", async function (assert) { @@ -70,35 +70,29 @@ module("Integration | Component | cf-field/input/date", function (hooks) { await render(hbs``); await setLocale("en-us"); - await fillIn(".ember-flatpickr-input:not([type='hidden'])", "something"); + await fillIn(".ember-flatpickr-input.input", "something"); await blur(); assert.strictEqual(this.value, null); - assert.dom(".ember-flatpickr-input:not([type='hidden'])").hasValue(""); - assert.dom(".ember-flatpickr-input[type='hidden']").hasValue(""); + assert.dom(".ember-flatpickr-input.input").hasValue(""); + assert.dom(".ember-flatpickr-input.flatpickr-input").hasValue(""); - await fillIn(".ember-flatpickr-input:not([type='hidden'])", "1/30/2013"); + await fillIn(".ember-flatpickr-input.input", "1/30/2013"); await blur(); assert.strictEqual(this.value, "2013-01-30"); - assert - .dom(".ember-flatpickr-input:not([type='hidden'])") - .hasValue("01/30/2013"); - assert.dom(".ember-flatpickr-input[type='hidden']").hasValue("2013-01-30"); + assert.dom(".ember-flatpickr-input.input").hasValue("01/30/2013"); + assert.dom(".ember-flatpickr-input.flatpickr-input").hasValue("2013-01-30"); await setLocale("de-ch"); - await fillIn(".ember-flatpickr-input:not([type='hidden'])", "20.2.2022"); + await fillIn(".ember-flatpickr-input.input", "20.2.2022"); await blur(); assert.strictEqual(this.value, "2022-02-20"); - assert - .dom(".ember-flatpickr-input:not([type='hidden'])") - .hasValue("20.02.2022"); - assert.dom(".ember-flatpickr-input[type='hidden']").hasValue("2022-02-20"); + assert.dom(".ember-flatpickr-input.input").hasValue("20.02.2022"); + assert.dom(".ember-flatpickr-input.flatpickr-input").hasValue("2022-02-20"); - await fillIn(".ember-flatpickr-input:not([type='hidden'])", "25.03.2021"); + await fillIn(".ember-flatpickr-input.input", "25.03.2021"); await blur(); assert.strictEqual(this.value, "2021-03-25"); - assert - .dom(".ember-flatpickr-input:not([type='hidden'])") - .hasValue("25.03.2021"); - assert.dom(".ember-flatpickr-input[type='hidden']").hasValue("2021-03-25"); + assert.dom(".ember-flatpickr-input.input").hasValue("25.03.2021"); + assert.dom(".ember-flatpickr-input.flatpickr-input").hasValue("2021-03-25"); }); }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9a02c6ac..92f973774 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -246,8 +246,8 @@ importers: specifier: 8.1.2 version: 8.1.2 ember-flatpickr: - specifier: 7.1.0 - version: 7.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) + specifier: 8.0.0 + version: 8.0.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) ember-intl: specifier: 6.5.3 version: 6.5.3(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3) @@ -682,8 +682,8 @@ importers: specifier: ^8.1.2 version: 8.1.2 ember-flatpickr: - specifier: ^7.1.0 - version: 7.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) + specifier: ^8.0.0 + version: 8.0.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) ember-intl: specifier: ^6.5.3 version: 6.5.3(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3) @@ -866,8 +866,8 @@ importers: specifier: ^8.1.2 version: 8.1.2 ember-flatpickr: - specifier: ^7.1.0 - version: 7.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) + specifier: ^8.0.0 + version: 8.0.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) ember-in-viewport: specifier: ^4.1.0 version: 4.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(webpack@5.90.3) @@ -1066,8 +1066,8 @@ importers: specifier: ^8.1.2 version: 8.1.2 ember-flatpickr: - specifier: ^7.1.0 - version: 7.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) + specifier: ^8.0.0 + version: 8.0.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) ember-intl: specifier: ^6.5.3 version: 6.5.3(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3) @@ -11077,8 +11077,8 @@ packages: - encoding - supports-color - /ember-flatpickr@7.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3): - resolution: {integrity: sha512-EnjwaHAUxH1Z5cBjDgUQwR4GTMI+8tlphH4CzKTYhbwIaESUTlNGmHXYR/D4T8RSzF/Sp0Wm0F3+309NqUUQew==} + /ember-flatpickr@8.0.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3): + resolution: {integrity: sha512-zcbBMXJ8o1jr5WvnnL96Wrg+aMuODvzsEp6UPKS41fYGH6fjm7oXNeRVCns9byWgqmSEn6sRKBqK3CetLR6oYg==} engines: {node: 18.* || >= 20, pnpm: ^8.14.1} peerDependencies: ember-source: ^4.8.0 || ^5.0.0 @@ -20416,7 +20416,7 @@ packages: ember-composable-helpers: 5.0.0 ember-concurrency: 4.0.1(@babel/core@7.24.0)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0) ember-fetch: 8.1.2 - ember-flatpickr: 7.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) + ember-flatpickr: 8.0.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) ember-in-viewport: 4.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(webpack@5.90.3) ember-intl: 6.5.3(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3) ember-math-helpers: 4.0.0(ember-source@5.7.0) @@ -20477,7 +20477,7 @@ packages: ember-composable-helpers: 5.0.0 ember-concurrency: 4.0.1(@babel/core@7.24.0)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0) ember-fetch: 8.1.2 - ember-flatpickr: 7.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) + ember-flatpickr: 8.0.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(flatpickr@4.6.13)(webpack@5.90.3) ember-in-viewport: 4.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)(webpack@5.90.3) ember-intl: 6.5.3(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3) ember-math-helpers: 4.0.0(ember-source@5.7.0)