starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-07-14 16:52:53 +02:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

fix: datepicker doesn't recalculate position when changing view mode

Browse Source
This commit is contained in:
Herculino Trotta
2025-12-19 22:21:03 -03:00
parent 3dce9e1c55
commit 94f5c25829
1 changed files with 92 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/js/datepicker.js
+52 -24
View File
@@ -1,5 +1,5 @@
import AirDatepicker from 'air-datepicker'; import AirDatepicker from 'air-datepicker';
import {createPopper} from '@popperjs/core'; import { createPopper } from '@popperjs/core';
import '../styles/_datepicker.scss' import '../styles/_datepicker.scss'
// --- Static Locale Imports --- // --- Static Locale Imports ---
@@ -78,11 +78,11 @@ const allLocales = {
/** /**
 * Selects a pre-imported language file from the locale map. * Selects a pre-imported language file from the locale map.
 * *
 * @param {string} langCode - The two-letter language code (e.g., 'en', 'es'). * @param {string} langCode - The two-letter language code (e.g., 'en', 'es').
 * @returns {Promise<object>} A promise that resolves with the locale object. * @returns {Promise<object>} A promise that resolves with the locale object.
 */ */
export const getLocale = async (langCode) => { export const getLocale = async (langCode) => {
const locale = allLocales[langCode]; const locale = allLocales[langCode];
@@ -112,7 +112,7 @@ window.DatePicker = async function createDynamicDatePicker(element) {
content: element.dataset.nowButtonTxt, content: element.dataset.nowButtonTxt,
onClick: (dp) => { onClick: (dp) => {
let date = new Date(); let date = new Date();
dp.selectDate(date, {updateTime: true}); dp.selectDate(date, { updateTime: true });
dp.setViewDate(date); dp.setViewDate(date);
} }
}; };
@@ -126,16 +126,18 @@ window.DatePicker = async function createDynamicDatePicker(element) {
autoClose: element.dataset.autoClose === 'true', autoClose: element.dataset.autoClose === 'true',
buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton], buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton],
locale: await getLocale(element.dataset.language), locale: await getLocale(element.dataset.language),
onSelect: ({date, formattedDate, datepicker}) => { onSelect: ({ date, formattedDate, datepicker }) => {
const _event = new CustomEvent("change", { const _event = new CustomEvent("change", {
bubbles: true, bubbles: true,
}); });
datepicker.$el.dispatchEvent(_event); datepicker.$el.dispatchEvent(_event);
} }
}; };
// Store popper instance for updating on view changes
let popperInstance = null;
const positionConfig = !isOnMobile ? { const positionConfig = !isOnMobile ? {
position({$datepicker, $target, $pointer, done}) { position({ $datepicker, $target, $pointer, done }) {
let popper = createPopper($target, $datepicker, { popperInstance = createPopper($target, $datepicker, {
placement: 'bottom', placement: 'bottom',
modifiers: [ modifiers: [
{ {
@@ -161,12 +163,20 @@ window.DatePicker = async function createDynamicDatePicker(element) {
] ]
}); });
return function completeHide() { return function completeHide() {
popper.destroy(); popperInstance.destroy();
popperInstance = null;
done(); done();
}; };
},
onChangeView() {
// Update popper position when view changes (e.g., clicking year)
// Use setTimeout to allow the DOM to update before recalculating
if (popperInstance) {
setTimeout(() => popperInstance.update(), 0);
}
} }
} : {}; } : {};
let opts = {...baseOpts, ...positionConfig}; let opts = { ...baseOpts, ...positionConfig };
if (element.dataset.value) { if (element.dataset.value) {
opts["selectedDates"] = [element.dataset.value]; opts["selectedDates"] = [element.dataset.value];
opts["startDate"] = [element.dataset.value]; opts["startDate"] = [element.dataset.value];
@@ -179,7 +189,7 @@ window.MonthYearPicker = async function createDynamicDatePicker(element) {
content: element.dataset.nowButtonTxt, content: element.dataset.nowButtonTxt,
onClick: (dp) => { onClick: (dp) => {
let date = new Date(); let date = new Date();
dp.selectDate(date, {updateTime: true}); dp.selectDate(date, { updateTime: true });
dp.setViewDate(date); dp.setViewDate(date);
} }
}; };
@@ -193,16 +203,18 @@ window.MonthYearPicker = async function createDynamicDatePicker(element) {
autoClose: element.dataset.autoClose === 'true', autoClose: element.dataset.autoClose === 'true',
buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton], buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton],
locale: await getLocale(element.dataset.language), locale: await getLocale(element.dataset.language),
onSelect: ({date, formattedDate, datepicker}) => { onSelect: ({ date, formattedDate, datepicker }) => {
const _event = new CustomEvent("change", { const _event = new CustomEvent("change", {
bubbles: true, bubbles: true,
}); });
datepicker.$el.dispatchEvent(_event); datepicker.$el.dispatchEvent(_event);
} }
}; };
// Store popper instance for updating on view changes
let popperInstance = null;
const positionConfig = !isOnMobile ? { const positionConfig = !isOnMobile ? {
position({$datepicker, $target, $pointer, done}) { position({ $datepicker, $target, $pointer, done }) {
let popper = createPopper($target, $datepicker, { popperInstance = createPopper($target, $datepicker, {
placement: 'bottom', placement: 'bottom',
modifiers: [ modifiers: [
{ {
@@ -228,12 +240,19 @@ window.MonthYearPicker = async function createDynamicDatePicker(element) {
] ]
}); });
return function completeHide() { return function completeHide() {
popper.destroy(); popperInstance.destroy();
popperInstance = null;
done(); done();
}; };
},
onChangeView() {
// Update popper position when view changes (e.g., clicking year)
if (popperInstance) {
setTimeout(() => popperInstance.update(), 0);
}
} }
} : {}; } : {};
let opts = {...baseOpts, ...positionConfig}; let opts = { ...baseOpts, ...positionConfig };
if (element.dataset.value) { if (element.dataset.value) {
opts["selectedDates"] = [new Date(element.dataset.value + "T00:00:00")]; opts["selectedDates"] = [new Date(element.dataset.value + "T00:00:00")];
opts["startDate"] = [new Date(element.dataset.value + "T00:00:00")]; opts["startDate"] = [new Date(element.dataset.value + "T00:00:00")];
@@ -246,7 +265,7 @@ window.YearPicker = async function createDynamicDatePicker(element) {
content: element.dataset.nowButtonTxt, content: element.dataset.nowButtonTxt,
onClick: (dp) => { onClick: (dp) => {
let date = new Date(); let date = new Date();
dp.selectDate(date, {updateTime: true}); dp.selectDate(date, { updateTime: true });
dp.setViewDate(date); dp.setViewDate(date);
} }
}; };
@@ -260,16 +279,18 @@ window.YearPicker = async function createDynamicDatePicker(element) {
autoClose: element.dataset.autoClose === 'true', autoClose: element.dataset.autoClose === 'true',
buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton], buttons: element.dataset.clearButton === 'true' ? ['clear', todayButton] : [todayButton],
locale: await getLocale(element.dataset.language), locale: await getLocale(element.dataset.language),
onSelect: ({date, formattedDate, datepicker}) => { onSelect: ({ date, formattedDate, datepicker }) => {
const _event = new CustomEvent("change", { const _event = new CustomEvent("change", {
bubbles: true, bubbles: true,
}); });
datepicker.$el.dispatchEvent(_event); datepicker.$el.dispatchEvent(_event);
} }
}; };
// Store popper instance for updating on view changes
let popperInstance = null;
const positionConfig = !isOnMobile ? { const positionConfig = !isOnMobile ? {
position({$datepicker, $target, $pointer, done}) { position({ $datepicker, $target, $pointer, done }) {
let popper = createPopper($target, $datepicker, { popperInstance = createPopper($target, $datepicker, {
placement: 'bottom', placement: 'bottom',
modifiers: [ modifiers: [
{ {
@@ -295,12 +316,19 @@ window.YearPicker = async function createDynamicDatePicker(element) {
] ]
}); });
return function completeHide() { return function completeHide() {
popper.destroy(); popperInstance.destroy();
popperInstance = null;
done(); done();
}; };
},
onChangeView() {
// Update popper position when view changes (e.g., clicking year)
if (popperInstance) {
setTimeout(() => popperInstance.update(), 0);
}
} }
} : {}; } : {};
let opts = {...baseOpts, ...positionConfig}; let opts = { ...baseOpts, ...positionConfig };
if (element.dataset.value) { if (element.dataset.value) {
opts["selectedDates"] = [new Date(element.dataset.value + "T00:00:00")]; opts["selectedDates"] = [new Date(element.dataset.value + "T00:00:00")];
opts["startDate"] = [new Date(element.dataset.value + "T00:00:00")]; opts["startDate"] = [new Date(element.dataset.value + "T00:00:00")];