From 0605e03d3064e8ddf6b4d295517d76e2cd536235 Mon Sep 17 00:00:00 2001 From: Bhavi Date: Mon, 21 Jul 2025 19:08:31 +0530 Subject: [PATCH 1/8] [Issue-39831] Resolve Calendar popup opens over display --- lib/web/mage/calendar.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index 2ed4de71f3f40..3400750ae3f42 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -104,9 +104,11 @@ define([ _overwriteFindPos: function () { $.datepicker.constructor.prototype._findPos = function (obj) { - let domPosition = obj.getBoundingClientRect(); - - return [domPosition.left, domPosition.top]; + var rect = obj.getBoundingClientRect(); + var docEl = document.documentElement; + var left = rect.left + (window.pageXOffset || docEl.scrollLeft || 0); + var top = rect.top + (window.pageYOffset || docEl.scrollTop || 0); + return [left, top]; }; }, From db539d2158196413471ee4c065dc82e4d8254921 Mon Sep 17 00:00:00 2001 From: Bhavi Date: Tue, 22 Jul 2025 15:50:18 +0530 Subject: [PATCH 2/8] [bugfix-39831] Change static file tests --- lib/web/mage/calendar.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index 3400750ae3f42..781275cf87927 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -102,12 +102,13 @@ define([ } }, - _overwriteFindPos: function () { + _overwriteFindPos: function () { $.datepicker.constructor.prototype._findPos = function (obj) { - var rect = obj.getBoundingClientRect(); - var docEl = document.documentElement; - var left = rect.left + (window.pageXOffset || docEl.scrollLeft || 0); - var top = rect.top + (window.pageYOffset || docEl.scrollTop || 0); + var rect = obj.getBoundingClientRect(), + docEl = document.documentElement, + left = rect.left + (window.pageXOffset || docEl.scrollLeft || 0), + top = rect.top + (window.pageYOffset || docEl.scrollTop || 0); + return [left, top]; }; }, From c813fcd89e98dd61c75d8294db30eba4bc859f4b Mon Sep 17 00:00:00 2001 From: Bhavi Date: Tue, 22 Jul 2025 16:53:47 +0530 Subject: [PATCH 3/8] [bugfix-39831] Change static file tests --- lib/web/mage/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index 781275cf87927..96cf4ca7b79e7 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -102,7 +102,7 @@ define([ } }, - _overwriteFindPos: function () { + _overwriteFindPos: function () { $.datepicker.constructor.prototype._findPos = function (obj) { var rect = obj.getBoundingClientRect(), docEl = document.documentElement, From c02d5030ac35e1d525f6907fb56826d19adb78c8 Mon Sep 17 00:00:00 2001 From: Bhavi Date: Tue, 22 Jul 2025 17:54:39 +0530 Subject: [PATCH 4/8] [bugfix-39831] Change static file tests --- lib/web/mage/calendar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index 96cf4ca7b79e7..0409012440c1b 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -1,6 +1,6 @@ /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. + * Copyright 2025 Adobe + * All Rights Reserved. */ /*eslint max-depth: 0*/ From fb41394a5d58bf8546ab5c89a374767c3a674611 Mon Sep 17 00:00:00 2001 From: Bhavi Date: Tue, 22 Jul 2025 20:59:45 +0530 Subject: [PATCH 5/8] [bugfix-39831] Change static file tests --- lib/web/mage/calendar.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index 0409012440c1b..008152b6d1d12 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -104,6 +104,10 @@ define([ _overwriteFindPos: function () { $.datepicker.constructor.prototype._findPos = function (obj) { + if (!obj || typeof obj.getBoundingClientRect !== 'function') { + // Return a default position or throw a descriptive error + return [0, 0]; + } var rect = obj.getBoundingClientRect(), docEl = document.documentElement, left = rect.left + (window.pageXOffset || docEl.scrollLeft || 0), From 60c128bcad3304b143cbb978503117febd86c9b5 Mon Sep 17 00:00:00 2001 From: Bhavi Date: Tue, 22 Jul 2025 22:38:47 +0530 Subject: [PATCH 6/8] [bugfix-39831] Change static file tests --- lib/web/mage/calendar.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index 008152b6d1d12..776b1788905da 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -104,15 +104,15 @@ define([ _overwriteFindPos: function () { $.datepicker.constructor.prototype._findPos = function (obj) { - if (!obj || typeof obj.getBoundingClientRect !== 'function') { - // Return a default position or throw a descriptive error - return [0, 0]; - } var rect = obj.getBoundingClientRect(), docEl = document.documentElement, left = rect.left + (window.pageXOffset || docEl.scrollLeft || 0), top = rect.top + (window.pageYOffset || docEl.scrollTop || 0); + if (!obj || typeof obj.getBoundingClientRect !== 'function') { + // Return a default position or throw a descriptive error + return [0, 0]; + } return [left, top]; }; }, From f2244e1ef702a1bb17ad4ad54c13372e9890d896 Mon Sep 17 00:00:00 2001 From: Bhavi Date: Wed, 23 Jul 2025 11:59:09 +0530 Subject: [PATCH 7/8] [bugfix-39831] Change static file tests --- lib/web/mage/calendar.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index 776b1788905da..a64a461c43aee 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -103,16 +103,15 @@ define([ }, _overwriteFindPos: function () { - $.datepicker.constructor.prototype._findPos = function (obj) { - var rect = obj.getBoundingClientRect(), + var rect = obj.getBoundingClientRect(), docEl = document.documentElement, left = rect.left + (window.pageXOffset || docEl.scrollLeft || 0), top = rect.top + (window.pageYOffset || docEl.scrollTop || 0); - + + $.datepicker.constructor.prototype._findPos = function (obj) { if (!obj || typeof obj.getBoundingClientRect !== 'function') { - // Return a default position or throw a descriptive error return [0, 0]; - } + } return [left, top]; }; }, From bd7bc56898d07d6cde98c3c5565b21154ea5fe4b Mon Sep 17 00:00:00 2001 From: Bhavi Date: Wed, 23 Jul 2025 12:05:23 +0530 Subject: [PATCH 8/8] [bugfix-39831] Change static file tests --- lib/web/mage/calendar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js index a64a461c43aee..b7efe8424b365 100644 --- a/lib/web/mage/calendar.js +++ b/lib/web/mage/calendar.js @@ -103,12 +103,12 @@ define([ }, _overwriteFindPos: function () { - var rect = obj.getBoundingClientRect(), + $.datepicker.constructor.prototype._findPos = function (obj) { + var rect = obj.getBoundingClientRect(), docEl = document.documentElement, left = rect.left + (window.pageXOffset || docEl.scrollLeft || 0), top = rect.top + (window.pageYOffset || docEl.scrollTop || 0); - $.datepicker.constructor.prototype._findPos = function (obj) { if (!obj || typeof obj.getBoundingClientRect !== 'function') { return [0, 0]; }