updated wrapping required checkbox indicator (#3728)

shopsys · Jan 14, 2025 · b0329f6 · b0329f6
2 parents c804ce7 + 43e853f
commit b0329f6
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 4 deletions.
diff --git a/storefront/components/Basic/Link/Link.tsx b/storefront/components/Basic/Link/Link.tsx
@@ -46,6 +46,7 @@ export const Link: FC<LinkProps> = ({
     const classNameTwClass = twMergeCustom(
         linkPlaceholderTwClassSegments[0],
         isButton ? 'no-underline hover:no-underline' : linkPlaceholderTwClassSegments[1],
+        className,
     );
 
     const props = {

diff --git a/storefront/components/Blocks/Product/Watchdog/watchdogFormMeta.tsx b/storefront/components/Blocks/Product/Watchdog/watchdogFormMeta.tsx
@@ -72,7 +72,12 @@ export const useWatchdogFormMeta = (formProviderMethods: UseFormReturn<WatchdogF
                             i18nKey="GdprAgreementCheckbox"
                             components={{
                                 lnk1: privacyPolicyArticleUrl ? (
-                                    <Link isExternal href={privacyPolicyArticleUrl} target="_blank" />
+                                    <Link
+                                        isExternal
+                                        className="inline"
+                                        href={privacyPolicyArticleUrl}
+                                        target="_blank"
+                                    />
                                 ) : (
                                     <span className={linkPlaceholderTwClass} />
                                 ),

diff --git a/storefront/components/Layout/Footer/NewsletterForm/newsletterFormMeta.tsx b/storefront/components/Layout/Footer/NewsletterForm/newsletterFormMeta.tsx
@@ -67,7 +67,12 @@ export const useNewsletterFormMeta = (
                             i18nKey="PrivacyPolicyCheckbox"
                             components={{
                                 lnk1: privacyPolicyArticleUrl ? (
-                                    <Link isExternal href={privacyPolicyArticleUrl} target="_blank" />
+                                    <Link
+                                        isExternal
+                                        className="inline"
+                                        href={privacyPolicyArticleUrl}
+                                        target="_blank"
+                                    />
                                 ) : (
                                     <span className={linkPlaceholderTwClass} />
                                 ),

diff --git a/storefront/components/Pages/Contact/contactFormMeta.tsx b/storefront/components/Pages/Contact/contactFormMeta.tsx
@@ -89,7 +89,7 @@ export const useContactFormMeta = (formProviderMethods: UseFormReturn<ContactFor
                             i18nKey="GdprAgreementCheckbox"
                             components={{
                                 lnk1: privacyPolicyUrl ? (
-                                    <Link isExternal href={privacyPolicyUrl} target="_blank" />
+                                    <Link isExternal className="inline" href={privacyPolicyUrl} target="_blank" />
                                 ) : (
                                     <span className={linkPlaceholderTwClass} />
                                 ),

diff --git a/storefront/components/Pages/OrderConfirmation/RegistrationAfterOrder.tsx b/storefront/components/Pages/OrderConfirmation/RegistrationAfterOrder.tsx
@@ -132,6 +132,7 @@ export const RegistrationAfterOrder: FC = () => {
                                         render={(checkbox) => <FormLine>{checkbox}</FormLine>}
                                         checkboxProps={{
                                             label: formMeta.fields.privacyPolicy.label,
+                                            required: true,
                                         }}
                                     />
                                 </FormBlockWrapper>

diff --git a/storefront/components/Pages/Registration/RegistrationContent.tsx b/storefront/components/Pages/Registration/RegistrationContent.tsx
@@ -79,6 +79,7 @@ export const RegistrationContent: FC = () => {
                                 render={(checkbox) => <ChoiceFormLine>{checkbox}</ChoiceFormLine>}
                                 checkboxProps={{
                                     label: formMeta.fields.gdprAgreement.label,
+                                    required: true,
                                 }}
                             />
                             <CheckboxControlled

diff --git a/storefront/components/Pages/Registration/registrationFormMeta.tsx b/storefront/components/Pages/Registration/registrationFormMeta.tsx
@@ -206,7 +206,12 @@ export const useRegistrationFormMeta = (
                             i18nKey="GdprAgreementCheckbox"
                             components={{
                                 lnk1: privacyPolicyArticleUrl ? (
-                                    <Link isExternal href={privacyPolicyArticleUrl} target="_blank" />
+                                    <Link
+                                        isExternal
+                                        className="inline"
+                                        href={privacyPolicyArticleUrl}
+                                        target="_blank"
+                                    />
                                 ) : (
                                     <span className={linkPlaceholderTwClass} />
                                 ),

diff --git a/...pshots/e2e/authentication/registration.cy.ts/1-0-0 filled registration form.png b/...pshots/e2e/authentication/registration.cy.ts/1-0-0 filled registration form.png
diff --git a/...ess/snapshots/e2e/authentication/registration.cy.ts/1-0-2 after invalid try.png b/...ess/snapshots/e2e/authentication/registration.cy.ts/1-0-2 after invalid try.png