From f0d69cf62775aafa301aedce701b837eee8d1328 Mon Sep 17 00:00:00 2001 From: Angel Vil Date: Sun, 12 Oct 2025 19:44:09 +0200 Subject: [PATCH 1/2] Fix(admin): correct datepicker position inside modal-slide --- lib/web/mage/calendar.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index d78c8fd2b5cf1..e55ec8fbc346c 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -104,9 +104,10 @@ define([ _overwriteFindPos: function () { $.datepicker.constructor.prototype._findPos = function (obj) { - var position = $(obj).offset(); + let isInModalSlide = $(obj).closest('.modal-slide').length > 0; + let domPosition = isInModalSlide ? obj.getBoundingClientRect() : $(obj).offset(); - return [position.left, position.top]; + return [domPosition.left, domPosition.top]; }; }, From 59f4fd9d76698d4cc8b24cfa0430acbd971fced2 Mon Sep 17 00:00:00 2001 From: Angel Vil Date: Sun, 12 Oct 2025 23:04:44 +0200 Subject: [PATCH 2/2] refactor: merge let declarations and rename variable to position --- lib/web/mage/calendar.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index e55ec8fbc346c..3be1ace78b26f 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -104,10 +104,10 @@ define([ _overwriteFindPos: function () { $.datepicker.constructor.prototype._findPos = function (obj) { - let isInModalSlide = $(obj).closest('.modal-slide').length > 0; - let domPosition = isInModalSlide ? obj.getBoundingClientRect() : $(obj).offset(); + let isInModalSlide = $(obj).closest('.modal-slide').length > 0, + position = isInModalSlide ? obj.getBoundingClientRect() : $(obj).offset(); - return [domPosition.left, domPosition.top]; + return [position.left, position.top]; }; },