From 5301af2e9fe7eb894d4d2f25fa812d15f5aa0599 Mon Sep 17 00:00:00 2001 From: Zain Gulbaz Date: Fri, 11 Aug 2023 11:33:38 +0500 Subject: [PATCH] fix: If the input type "Name" is selected, the label can't be changed from our default label "Your Name" (#10618) Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> --- packages/features/form-builder/FormBuilder.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/features/form-builder/FormBuilder.tsx b/packages/features/form-builder/FormBuilder.tsx index 516be815fb..bcd49b9bad 100644 --- a/packages/features/form-builder/FormBuilder.tsx +++ b/packages/features/form-builder/FormBuilder.tsx @@ -530,6 +530,7 @@ function FieldLabel({ field }: { field: RhfFormField }) { const fieldTypeConfigVariantsConfig = fieldTypeConfig?.variantsConfig; const fieldTypeConfigVariants = fieldTypeConfigVariantsConfig?.variants; const variantsConfig = field.variantsConfig; + const variantsConfigVariants = variantsConfig?.variants; const defaultVariant = fieldTypeConfigVariantsConfig?.defaultVariant; if (!fieldTypeConfigVariants || !variantsConfig) { if (fieldsThatSupportLabelAsSafeHtml.includes(field.type)) { @@ -551,7 +552,9 @@ function FieldLabel({ field }: { field: RhfFormField }) { "Field has `variantsConfig` but no `defaultVariant`" + JSON.stringify(fieldTypeConfigVariantsConfig) ); } - return {t(fieldTypeConfigVariants[variant as keyof typeof fieldTypeConfigVariants].label)}; + const label = + variantsConfigVariants?.[variant as keyof typeof fieldTypeConfigVariants]?.fields?.[0]?.label || ""; + return {t(label)}; } function VariantSelector() {