From f955e2f2c75cecfdeeaf77a81a666679a132bdc7 Mon Sep 17 00:00:00 2001 From: Kim Biesbjerg Date: Sat, 13 Apr 2024 11:34:13 +0200 Subject: [PATCH 1/2] Check if element has assignedSlot --- src/VueDatePicker/composables/position.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VueDatePicker/composables/position.ts b/src/VueDatePicker/composables/position.ts index c3d41d6e7..054b81ed0 100644 --- a/src/VueDatePicker/composables/position.ts +++ b/src/VueDatePicker/composables/position.ts @@ -225,7 +225,7 @@ export const usePosition = ({ const getScrollableParent = function (el: HTMLElement | null): Window | HTMLElement { if (!el || el === document.body || el.nodeType === Node.DOCUMENT_FRAGMENT_NODE) return window; if (isScrollable(el)) return el; - return getScrollableParent(el.parentNode as HTMLElement); + return getScrollableParent(el.assignedSlot ? el.assignedSlot.parentElement : el.parentElement); }; const getShadowPos = (rect?: DOMRect) => { From aa5af31961870f8b40342e4db22d1f0d7e88a463 Mon Sep 17 00:00:00 2001 From: Kim Biesbjerg Date: Sun, 14 Apr 2024 17:00:25 +0200 Subject: [PATCH 2/2] Use parentNode --- src/VueDatePicker/composables/position.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VueDatePicker/composables/position.ts b/src/VueDatePicker/composables/position.ts index 054b81ed0..b5500c2e3 100644 --- a/src/VueDatePicker/composables/position.ts +++ b/src/VueDatePicker/composables/position.ts @@ -225,7 +225,7 @@ export const usePosition = ({ const getScrollableParent = function (el: HTMLElement | null): Window | HTMLElement { if (!el || el === document.body || el.nodeType === Node.DOCUMENT_FRAGMENT_NODE) return window; if (isScrollable(el)) return el; - return getScrollableParent(el.assignedSlot ? el.assignedSlot.parentElement : el.parentElement); + return getScrollableParent((el.assignedSlot ? el.assignedSlot.parentNode : el.parentNode) as HTMLElement); }; const getShadowPos = (rect?: DOMRect) => {