fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-22 17:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autofocus primary button in modals (#31883)

Browse source
This commit is contained in:
Claire 2024-09-12 15:15:05 +02:00 committed by GitHub
parent c35ea59ee6
commit 5f782f9629
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/components/block_modal.jsx
View file

@ -99,7 +99,7 @@ export const BlockModal = ({ accountId, acct }) => {
<FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' /> <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
</button> </button>
<Button onClick={handleClick}> <Button onClick={handleClick} autoFocus>
<FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' /> <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
</Button> </Button>
</div> </div>

5
app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
View file

@ -71,7 +71,10 @@ export const ConfirmationModal: React.FC<
/> />
</button> </button>
<Button onClick={handleClick}>{confirm}</Button> {/* eslint-disable-next-line jsx-a11y/no-autofocus -- we are in a modal and thus autofocusing is justified */}
<Button onClick={handleClick} autoFocus>
{confirm}
</Button>
</div> </div>
</div> </div>
</div> </div>

2
app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
View file

@ -88,7 +88,7 @@ export const DomainBlockModal = ({ domain, accountId, acct }) => {
<FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' /> <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
</button> </button>
<Button onClick={handleClick}> <Button onClick={handleClick} autoFocus>
<FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' /> <FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' />
</Button> </Button>
</div> </div>

2
app/javascript/mastodon/features/ui/components/mute_modal.jsx
View file

@ -137,7 +137,7 @@ export const MuteModal = ({ accountId, acct }) => {
<FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' /> <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
</button> </button>
<Button onClick={handleClick}> <Button onClick={handleClick} autoFocus>
<FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' /> <FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
</Button> </Button>
</div> </div>