Skip to content

Commit 598d06f

Browse files
@W-19143871 Fix button styling and input text truncation on email subscription footer component
1 parent 33e4f76 commit 598d06f

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

packages/template-retail-react-app/app/components/subscription/subscribe-form.jsx

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ import React, {useRef, useEffect} from 'react'
88
import PropTypes from 'prop-types'
99
import {
1010
Box,
11+
Flex,
1112
Text,
1213
Heading,
1314
Input,
14-
InputGroup,
15-
InputRightElement,
1615
Button,
1716
Alert,
1817
AlertIcon,
@@ -36,7 +35,7 @@ const SubscribeForm = ({subscription, ...otherProps}) => {
3635
subscribeHeading: subscribeFormStyles.heading,
3736
subscribeMessage: subscribeFormStyles.message,
3837
subscribeField: subscribeFormStyles.field,
39-
subscribeButtonContainer: subscribeFormStyles.buttonContainer,
38+
subscribeButton: subscribeFormStyles.button,
4039
socialIcons: subscribeFormStyles.socialIcons,
4140
subscribeDisclaimer: subscribeFormStyles.disclaimer
4241
}
@@ -102,7 +101,7 @@ const SubscribeForm = ({subscription, ...otherProps}) => {
102101
)}
103102

104103
<Box>
105-
<InputGroup>
104+
<Flex>
106105
<Input
107106
ref={emailInputRef}
108107
type="email"
@@ -119,17 +118,16 @@ const SubscribeForm = ({subscription, ...otherProps}) => {
119118
id="subscribe-email"
120119
{...styles.subscribeField}
121120
/>
122-
<InputRightElement {...styles.subscribeButtonContainer}>
123-
<Button
124-
variant="footer"
125-
onClick={actions?.submit}
126-
isLoading={state?.isLoading}
127-
loadingText={messages.buttonSignUp}
128-
>
129-
{messages.buttonSignUp}
130-
</Button>
131-
</InputRightElement>
132-
</InputGroup>
121+
<Button
122+
variant="footer"
123+
onClick={actions?.submit}
124+
isLoading={state?.isLoading}
125+
loadingText={messages.buttonSignUp}
126+
{...styles.subscribeButton}
127+
>
128+
{messages.buttonSignUp}
129+
</Button>
130+
</Flex>
133131

134132
<Text {...styles.subscribeDisclaimer}>
135133
<FormattedMessage

packages/template-retail-react-app/app/theme/components/project/subscribe-form.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default {
1010
'heading',
1111
'message',
1212
'field',
13-
'buttonContainer',
13+
'button',
1414
'socialIcons',
1515
'link',
1616
'disclaimer'
@@ -30,10 +30,14 @@ export default {
3030
},
3131
field: {
3232
background: 'white',
33-
color: 'gray.900'
33+
color: 'gray.900',
34+
borderRightRadius: 0
3435
},
35-
buttonContainer: {
36-
width: 'auto'
36+
button: {
37+
borderLeftRadius: 0,
38+
height: 'auto',
39+
paddingLeft: 4,
40+
paddingRight: 4
3741
},
3842
socialIcons: {
3943
marginTop: 4

0 commit comments

Comments
 (0)