Skip to content

[patch] Fix Halstack Provider labels #2546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PelayoFelgueroso wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −15
Open

[patch] Fix Halstack Provider labels #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
987c592
fix placeholder prop usage at examples
PelayoFelgueroso Sep 23, 2026
4d46aed
Fix halstackprovider labels issue
PelayoFelgueroso Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/website/screens/guidelines/localization/examples/localization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const labels = {
<DxcFlex direction="column" gap="2rem">
<DxcDateInput
label="Date"
placeholder="Select a date"
placeholder
optional
/>
<DxcTimeInput
Expand Down
2 changes: 1 addition & 1 deletion apps/website/screens/utilities/halstack-provider/examples/customLocalization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const code = `() => {
/>
<DxcDateInput
label="Date"
placeholder="Select a date"
placeholder
optional
/>
</DxcFlex>
Expand Down
27 changes: 14 additions & 13 deletions packages/lib/src/HalstackContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
Loading