Skip to content
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

fix: compressed layout dynamic fields card #353

Closed
wants to merge 2 commits into from
Closed

fix: compressed layout dynamic fields card #353

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a50f8a
fix: compressed layout dynamic fields card
May 7, 2024
074d0bf
fix: card comment addressed
May 7, 2024
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
119 changes: 79 additions & 40 deletions src/Components/DynamicFields.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,16 +343,38 @@ let make = (

let spacedStylesForBiilingDetails = isSpacedInnerLayout ? "p-2" : "my-2"
let spacedStylesForCity = isSpacedInnerLayout ? "p-2" : ""
let errorMsgInCompressedLayout = if cardError->String.length > 0 {
cardError
} else if expiryError->String.length > 0 {
expiryError
} else if cvcError->String.length > 0 {
cvcError
} else {
""
}

<RenderIf condition={fieldsArr->Array.length > 0}>
{<>
<RenderIf
condition={dynamicFieldsToRenderOutsideBilling->Array.length > 0 && !isSpacedInnerLayout}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition can also be true when for payment methods other than cards

<div
style={ReactDOMStyle.make(
~marginBottom="5px",
~marginTop="5px",
~fontSize=themeObj.fontSizeLg,
~opacity="0.6",
(),
)}>
{localeString.cardHeader->React.string}
</div>
</RenderIf>
{dynamicFieldsToRenderOutsideBilling
->Array.mapWithIndex((item, index) => {
<div
key={`outside-billing-${index->Int.toString}`}
className="flex flex-col w-full place-content-between"
style={ReactDOMStyle.make(
~marginTop=index !== 0 ? themeObj.spacingGridColumn : "",
~marginTop=index !== 0 && isSpacedInnerLayout ? themeObj.spacingGridColumn : "",
~gridColumnGap=themeObj.spacingGridRow,
(),
)}>
Expand Down Expand Up @@ -416,45 +438,61 @@ let make = (
placeholder="123"
/>
| CardExpiryAndCvc =>
<div className="flex gap-10">
<PaymentInputField
fieldName=localeString.validThruText
isValid=isExpiryValid
setIsValid=setIsExpiryValid
value=cardExpiry
onChange=changeCardExpiry
onBlur=handleExpiryBlur
errorString=expiryError
paymentType
type_="tel"
appearance=config.appearance
maxLength=7
inputRef=expiryRef
placeholder="MM / YY"
/>
<PaymentInputField
fieldName=localeString.cvcTextLabel
isValid=isCVCValid
setIsValid=setIsCVCValid
value=cvcNumber
onChange=changeCVCNumber
onBlur=handleCVCBlur
errorString=cvcError
paymentType
rightIcon={CardUtils.setRightIconForCvc(
~cardEmpty,
~cardInvalid,
~color=themeObj.colorIconCardCvcError,
~cardComplete,
)}
appearance=config.appearance
type_="tel"
className="tracking-widest w-full"
maxLength=4
inputRef=cvcRef
placeholder="123"
/>
</div>
<>
<div className={`flex ${isSpacedInnerLayout ? "gap-10" : ""}`}>
<PaymentInputField
fieldName=localeString.validThruText
isValid=isExpiryValid
setIsValid=setIsExpiryValid
value=cardExpiry
onChange=changeCardExpiry
onBlur=handleExpiryBlur
errorString=expiryError
paymentType
type_="tel"
appearance=config.appearance
maxLength=7
inputRef=expiryRef
placeholder="MM / YY"
/>
<PaymentInputField
fieldName=localeString.cvcTextLabel
isValid=isCVCValid
setIsValid=setIsCVCValid
value=cvcNumber
onChange=changeCVCNumber
onBlur=handleCVCBlur
errorString=cvcError
paymentType
rightIcon={CardUtils.setRightIconForCvc(
~cardEmpty,
~cardInvalid,
~color=themeObj.colorIconCardCvcError,
~cardComplete,
)}
appearance=config.appearance
type_="tel"
className="tracking-widest w-full"
maxLength=4
inputRef=cvcRef
placeholder="123"
/>
</div>
<RenderIf
condition={!isSpacedInnerLayout && errorMsgInCompressedLayout->String.length > 0}>
<div
className="Error pt-1"
style={ReactDOMStyle.make(
~color=themeObj.colorDangerText,
~fontSize=themeObj.fontSizeSm,
~alignSelf="start",
~textAlign="left",
(),
)}>
{React.string(errorMsgInCompressedLayout)}
</div>
</RenderIf>
</>
| Currency(currencyArr) =>
<DropdownField
appearance=config.appearance
Expand All @@ -470,6 +508,7 @@ let make = (
<div
style={ReactDOMStyle.make(
~marginBottom="5px",
~marginTop="5px",
~fontSize=themeObj.fontSizeLg,
~opacity="0.6",
(),
Expand Down
Loading