From d80c4f0131e8f174fd43bc63968a5b7937b8de4a Mon Sep 17 00:00:00 2001
From: martascorreia <marta.correia@virtual-identity.com>
Date: Mon, 9 Mar 2026 14:54:53 +0000
Subject: [PATCH 1/4] fix: datepicker overlap fix

---
 packages/components/src/components/datepicker/datepicker.ts | 2 +-
 packages/components/src/components/popup/popup.ts           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/components/datepicker/datepicker.ts b/packages/components/src/components/datepicker/datepicker.ts
index a0464dd13b..74861a3a94 100644
--- a/packages/components/src/components/datepicker/datepicker.ts
+++ b/packages/components/src/components/datepicker/datepicker.ts
@@ -1969,7 +1969,7 @@ export default class SdDatepicker extends SolidElement implements SolidFormContr
                   id="label"
                   part="form-control-floating-label"
                   class=${cx(
-                    'absolute left-4 z-20 pointer-events-none transition-all duration-200',
+                    'absolute left-4 z-10 pointer-events-none transition-all duration-200',
                     !isFloatingLabelActive
                       ? 'top-1/2 -translate-y-1/2'
                       : this.size === 'lg'
diff --git a/packages/components/src/components/popup/popup.ts b/packages/components/src/components/popup/popup.ts
index afe19afbce..71b0f1ecfb 100644
--- a/packages/components/src/components/popup/popup.ts
+++ b/packages/components/src/components/popup/popup.ts
@@ -469,7 +469,7 @@ export default class SdPopup extends SolidElement {
 
       <div
         part="popup"
-        class=${cx('isolate', this.strategy !== 'fixed' ? 'absolute' : 'fixed', !this.active && 'hidden')}
+        class=${cx('isolate z-20', this.strategy !== 'fixed' ? 'absolute' : 'fixed', !this.active && 'hidden')}
       >
         <slot></slot>
         ${this.arrow ? html`<div part="arrow" class="absolute rotate-45 -z-10" role="presentation"></div>` : ''}

From 20abe4a3ab15a34236e763697cd46b37b4c21357 Mon Sep 17 00:00:00 2001
From: martascorreia <marta.correia@virtual-identity.com>
Date: Tue, 10 Mar 2026 15:23:13 +0000
Subject: [PATCH 2/4] chore: adding changeset

---
 .changeset/famous-baths-wave.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/famous-baths-wave.md

diff --git a/.changeset/famous-baths-wave.md b/.changeset/famous-baths-wave.md
new file mode 100644
index 0000000000..36866e8684
--- /dev/null
+++ b/.changeset/famous-baths-wave.md
@@ -0,0 +1,5 @@
+---
+'@solid-design-system/components': major
+---
+
+Fixed the overlaping issue of the sd-popup being under the sd-datepicker's input form.

From 060874720b5691d8f87c6da6ad1ced912c934025 Mon Sep 17 00:00:00 2001
From: martascorreia <marta.correia@virtual-identity.com>
Date: Tue, 10 Mar 2026 15:25:24 +0000
Subject: [PATCH 3/4] chore: correcting changeset

---
 .changeset/shaky-impalas-think.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/shaky-impalas-think.md

diff --git a/.changeset/shaky-impalas-think.md b/.changeset/shaky-impalas-think.md
new file mode 100644
index 0000000000..ed711c3243
--- /dev/null
+++ b/.changeset/shaky-impalas-think.md
@@ -0,0 +1,5 @@
+---
+'@solid-design-system/components': minor
+---
+
+Fixed the overlaping issue of the sd-popup being under the sd-datepicker's input form.

From 1e15e5848aa0b4648744a32d14bf980a7b514857 Mon Sep 17 00:00:00 2001
From: Marta Correia <48736172+martascorreia@users.noreply.github.com>
Date: Tue, 10 Mar 2026 15:26:05 +0000
Subject: [PATCH 4/4] delete .changeset/famous-baths-wave.md

---
 .changeset/famous-baths-wave.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changeset/famous-baths-wave.md

diff --git a/.changeset/famous-baths-wave.md b/.changeset/famous-baths-wave.md
deleted file mode 100644
index 36866e8684..0000000000
--- a/.changeset/famous-baths-wave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@solid-design-system/components': major
----
-
-Fixed the overlaping issue of the sd-popup being under the sd-datepicker's input form.