From 987c59276e934fc12eb2c4d175a21c029ee59b5a Mon Sep 17 00:00:00 2001
From: PelayoFelgueroso <pfelguerosogalguera@gmail.com>
Date: Wed, 23 Sep 2026 11:03:38 +0200
Subject: [PATCH 1/2] fix placeholder prop usage at examples

---
 .../screens/guidelines/localization/examples/localization.tsx   | 2 +-
 .../utilities/halstack-provider/examples/customLocalization.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/website/screens/guidelines/localization/examples/localization.tsx b/apps/website/screens/guidelines/localization/examples/localization.tsx
index f15d3daf0..9475e15ca 100644
--- a/apps/website/screens/guidelines/localization/examples/localization.tsx
+++ b/apps/website/screens/guidelines/localization/examples/localization.tsx
@@ -14,7 +14,7 @@ const labels = {
         <DxcFlex direction="column" gap="2rem">
           <DxcDateInput
             label="Date"
-            placeholder="Select a date"
+            placeholder
             optional
           />
           <DxcTimeInput
diff --git a/apps/website/screens/utilities/halstack-provider/examples/customLocalization.tsx b/apps/website/screens/utilities/halstack-provider/examples/customLocalization.tsx
index e6700fb36..4484e3222 100644
--- a/apps/website/screens/utilities/halstack-provider/examples/customLocalization.tsx
+++ b/apps/website/screens/utilities/halstack-provider/examples/customLocalization.tsx
@@ -19,7 +19,7 @@ const code = `() => {
           />
           <DxcDateInput
             label="Date"
-            placeholder="Select a date"
+            placeholder
             optional
           />
           </DxcFlex>

From 4d46aedf4fa46d3bc85772459fc48b19d7ef28dc Mon Sep 17 00:00:00 2001
From: PelayoFelgueroso <pfelguerosogalguera@gmail.com>
Date: Wed, 23 Sep 2026 11:12:59 +0200
Subject: [PATCH 2/2] Fix halstackprovider labels issue

---
 packages/lib/src/HalstackContext.tsx | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/lib/src/HalstackContext.tsx b/packages/lib/src/HalstackContext.tsx
index 5b61dd31b..5b67ff425 100644
--- a/packages/lib/src/HalstackContext.tsx
+++ b/packages/lib/src/HalstackContext.tsx
@@ -20,17 +20,16 @@ const HalstackLanguageContext = createContext<LocalizedContext>({ labels: defaul
 const HalstackLogosContext = createContext<Record<string, string | undefined>>(defaultThemedLogos);
 
 const parseLabels = (labels: DeepPartial<TranslatedLabels>): TranslatedLabels => {
-  const parsedLabels = defaultTranslatedComponentLabels;
+  const parsedLabels = { ...defaultTranslatedComponentLabels };
   (Object.keys(labels) as (keyof TranslatedLabels)[]).forEach((component) => {
-    if (parsedLabels[component]) {
-      const componentLabels = labels[component];
-      if (componentLabels != null) {
-        (Object.keys(parsedLabels[component]) as (keyof typeof componentLabels)[]).forEach((label) => {
-          if (componentLabels[label]) {
-            parsedLabels[component][label] = componentLabels[label];
-          }
-        });
-      }
+    const componentLabels = labels[component];
+    if (componentLabels != null) {
+      Object.assign(parsedLabels, {
+        [component]: {
+          ...parsedLabels[component],
+          ...componentLabels,
+        },
+      });
     }
   });
   return parsedLabels;
@@ -49,9 +48,11 @@ const HalstackThemed = styled.div<{ coreTheme?: ThemeType["tokens"] }>`
   ${(props) => {
     if (props.coreTheme)
       return css`
-        ${Object.keys(props.coreTheme).length
-          ? Object.entries(props.coreTheme).map(([key, val]) => `${key}: ${val};`)
-          : coreTokens}
+        ${
+          Object.keys(props.coreTheme).length
+            ? Object.entries(props.coreTheme).map(([key, val]) => `${key}: ${val};`)
+            : coreTokens
+        }
         ${aliasTokens}
       `;
     else {