Skip to content

Commit

Permalink
Merge branch 'main' of github.com:juspay/hyperswitch-web into sepa-de…
Browse files Browse the repository at this point in the history
…bit-terms-locale
  • Loading branch information
Saksham Sharma authored and Saksham Sharma committed Aug 12, 2024
2 parents ab9d1b7 + b571c55 commit d380a09
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 36 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## [0.82.2](https://github.com/juspay/hyperswitch-web/compare/v0.82.1...v0.82.2) (2024-08-09)

## [0.82.1](https://github.com/juspay/hyperswitch-web/compare/v0.82.0...v0.82.1) (2024-08-07)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "orca-payment-page",
"version": "0.82.1",
"version": "0.82.2",
"main": "index.js",
"private": true,
"dependencies": {
Expand Down
62 changes: 30 additions & 32 deletions src/Components/DropdownField.res
Original file line number Diff line number Diff line change
Expand Up @@ -101,42 +101,40 @@ let make = (
</div>
</RenderIf>
<div className="relative">
<div className={`Input ${className} appearance-none relative`}>
<RenderIf condition={isDisplayValueVisible && displayValue->Option.isSome}>
<div
className="absolute top-1 left-1 right-0 bottom-0 pointer-events-none rounded-sm z-20 whitespace-nowrap"
style={
background: disabled ? disbaledBG : themeObj.colorBackground,
opacity: disabled ? "35%" : "",
padding: themeObj.spacingUnit,
width: "95%",
}>
{React.string(displayValue->Option.getOr(""))}
</div>
</RenderIf>
<select
ref={dropdownRef->ReactDOM.Ref.domRef}
<RenderIf condition={isDisplayValueVisible && displayValue->Option.isSome}>
<div
className="absolute top-1 left-1 right-0 bottom-0 pointer-events-none rounded-sm z-20 whitespace-nowrap"
style={
background: disabled ? disbaledBG : themeObj.colorBackground,
opacity: disabled ? "35%" : "",
padding: themeObj.spacingUnit,
width: "100%",
}
name=""
value
disabled={readOnly || disabled}
onChange=handleChange
onFocus=handleFocus
className={`${inputClassStyles} ${className} w-full appearance-none outline-none ${cursorClass}`}>
{options
->Array.mapWithIndex((item, index) => {
<option key={Int.toString(index)} value=item.value>
{React.string(item.label->Option.getOr(item.value))}
</option>
})
->React.array}
</select>
</div>
width: "95%",
}>
{React.string(displayValue->Option.getOr(""))}
</div>
</RenderIf>
<select
ref={dropdownRef->ReactDOM.Ref.domRef}
style={
background: disabled ? disbaledBG : themeObj.colorBackground,
opacity: disabled ? "35%" : "",
padding: themeObj.spacingUnit,
width: "100%",
}
name=""
value
disabled={readOnly || disabled}
onChange=handleChange
onFocus=handleFocus
className={`${inputClassStyles} ${className} w-full appearance-none outline-none ${cursorClass}`}>
{options
->Array.mapWithIndex((item, index) => {
<option key={Int.toString(index)} value=item.value>
{React.string(item.label->Option.getOr(item.value))}
</option>
})
->React.array}
</select>
<RenderIf condition={config.appearance.labels == Floating}>
<div
className={`Label ${floatinglabelClass} absolute bottom-0 ml-3 ${focusClass}`}
Expand Down
3 changes: 2 additions & 1 deletion src/Components/DynamicFields.res
Original file line number Diff line number Diff line change
Expand Up @@ -493,13 +493,14 @@ let make = (
->React.array}
<RenderIf condition={isRenderDynamicFieldsInsideBilling}>
<div
className={`${spacedStylesForBiilingDetails} w-full text-left`}
className={`billing-section ${spacedStylesForBiilingDetails} w-full text-left`}
style={
border: {isSpacedInnerLayout ? `1px solid ${themeObj.borderColor}` : ""},
borderRadius: {isSpacedInnerLayout ? themeObj.borderRadius : ""},
margin: {isSpacedInnerLayout ? `10px 0` : ""},
}>
<div
className="billing-details-text"
style={
marginBottom: "5px",
fontSize: themeObj.fontSizeLg,
Expand Down

0 comments on commit d380a09

Please sign in to comment.