Skip to content

Commit

Permalink
Merge pull request #4239 from eaw-pid/WV-616
Browse files Browse the repository at this point in the history
[MERGE READY] - WV-616 - Ballot Page: ADA - Not tabbing through 'Edit Address'
  • Loading branch information
DaleMcGrew authored Feb 5, 2025
2 parents f5008dd + b4301bf commit 06859e1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/js/components/Ballot/BallotTitleHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class BallotTitleHeader extends Component {
>
Ballot for
{' '}
<span
<span tabIndex={0}
className={linksOff ? '' : 'u-link-color u-link-underline-on-hover'}
>
<span>
Expand All @@ -224,7 +224,7 @@ class BallotTitleHeader extends Component {
>
Ballot for
{' '}
<span className={linksOff ? '' : 'u-link-color u-link-underline-on-hover'}>
<span tabIndex={0} className={linksOff ? '' : 'u-link-color u-link-underline-on-hover'}>
{substitutedAddress}
</span>
{linksOff ? <></> : editIconStyled}
Expand All @@ -237,7 +237,7 @@ class BallotTitleHeader extends Component {
id="ballotTitleBallotAddress"
onClick={this.showSelectBallotModalEditAddress}
>
<span className={linksOff ? '' : 'u-link-color u-link-underline-on-hover'}>
<span tabIndex={0} className={linksOff ? '' : 'u-link-color u-link-underline-on-hover'}>
Click to enter your address
</span>
{linksOff ? <></> : editIconStyled}
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Style/BallotTitleHeaderStyles.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import DesignTokenColors from '../../common/components/Style/DesignTokenColors';
import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
import isMobileScreenSize from '../../common/utils/isMobileScreenSize'; // 2024-04-16 Upgrade to using this

export const BallotAddress = styled('div', {
export const BallotAddress = styled('button', {
shouldForwardProp: (prop) => !['centerText', 'allowTextWrap'].includes(prop),
})(({ allowTextWrap, centerText }) => (`
all: unset;
margin-left: 2px;
${isMobileScreenSize() || isCordova() ? '' : 'font-size: 18px;'}
${allowTextWrap || isMobileScreenSize() || isCordova() ? '' : 'overflow: hidden;'}
Expand Down

0 comments on commit 06859e1

Please sign in to comment.