Skip to content

Commit 3381b38

Browse files
authored
Make profile label render consistently when enabled switch is present (#1568)
Make profile render consistently when enabled switch is present
1 parent 2c9dd50 commit 3381b38

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

www/src/Pages/PinMapping.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ const options = Object.entries(BUTTON_ACTIONS)
8181
type: buttonMask
8282
? 'customButtonMask'
8383
: dpadMask
84-
? 'customDpadMask'
85-
: 'action',
84+
? 'customDpadMask'
85+
: 'action',
8686
customButtonMask: buttonMask?.value || 0,
8787
customDpadMask: dpadMask?.value || 0,
8888
};
@@ -121,7 +121,7 @@ const getMultiValue = (pinData: MaskPayload) => {
121121
type === 'customButtonMask') ||
122122
(pinData.customDpadMask & customDpadMask &&
123123
type === 'customDpadMask'),
124-
)
124+
)
125125
: options.filter((option) => option.value === pinData.action);
126126
};
127127

@@ -146,7 +146,7 @@ const ProfileLabel = memo(function ProfileLabel({
146146
);
147147

148148
return (
149-
<div className="pin-grid">
149+
<div>
150150
<Form.Label>{t('PinMapping:profile-label-title')}</Form.Label>
151151
<Form.Control
152152
type="text"
@@ -337,10 +337,12 @@ const PinSection = memo(function PinSection({
337337
})}
338338
>
339339
<Form onSubmit={handleSubmit}>
340-
<div className="d-flex justify-content-between">
341-
<ProfileLabel profileIndex={profileIndex} />
340+
<Row>
341+
<Col md={7}>
342+
<ProfileLabel profileIndex={profileIndex} />
343+
</Col>
342344
{profileIndex > 0 && (
343-
<div className="d-flex">
345+
<Col className='order-first order-md-last'>
344346
<FormCheck
345347
disabled={profileIndex === activeProfile}
346348
size={3}
@@ -367,9 +369,9 @@ const PinSection = memo(function PinSection({
367369
toggleProfileEnabled(profileIndex);
368370
}}
369371
/>
370-
</div>
372+
</Col>
371373
)}
372-
</div>
374+
</Row>
373375
<hr />
374376

375377
<PinSelectList profileIndex={profileIndex} />

0 commit comments

Comments
 (0)