-
-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mobile: Accessibility: Improve dialog accessibility (#11395)
- Loading branch information
1 parent
6eac8d9
commit 84eab77
Showing
26 changed files
with
478 additions
and
417 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
93 changes: 93 additions & 0 deletions
93
packages/app-mobile/components/DialogManager/PromptDialog.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| import * as React from 'react'; | ||
| import { Button, Dialog, Divider, Surface, Text } from 'react-native-paper'; | ||
| import { DialogType, PromptDialogData } from './types'; | ||
| import { StyleSheet } from 'react-native'; | ||
| import { useMemo } from 'react'; | ||
| import { themeStyle } from '../global-style'; | ||
|
|
||
| interface Props { | ||
| dialog: PromptDialogData; | ||
| themeId: number; | ||
| } | ||
|
|
||
| const useStyles = (themeId: number, isMenu: boolean) => { | ||
| return useMemo(() => { | ||
| const theme = themeStyle(themeId); | ||
|
|
||
| return StyleSheet.create({ | ||
| dialogContainer: { | ||
| backgroundColor: theme.backgroundColor, | ||
| borderRadius: 24, | ||
| paddingTop: 24, | ||
| marginLeft: 4, | ||
| marginRight: 4, | ||
| }, | ||
|
|
||
| buttonScrollerContent: { | ||
| flexDirection: 'row', | ||
| justifyContent: 'flex-end', | ||
| flexWrap: 'wrap', | ||
| }, | ||
|
|
||
| dialogContent: { | ||
| paddingBottom: 14, | ||
| }, | ||
| dialogActions: { | ||
| paddingBottom: 14, | ||
| paddingTop: 4, | ||
|
|
||
| ...(isMenu ? { | ||
| flexDirection: 'column', | ||
| alignItems: 'stretch', | ||
| } : {}), | ||
| }, | ||
| dialogLabel: { | ||
| textAlign: isMenu ? 'center' : undefined, | ||
| }, | ||
| }); | ||
| }, [themeId, isMenu]); | ||
| }; | ||
|
|
||
| const PromptDialog: React.FC<Props> = ({ dialog, themeId }) => { | ||
| const isMenu = dialog.type === DialogType.Menu; | ||
| const styles = useStyles(themeId, isMenu); | ||
|
|
||
| const buttons = dialog.buttons.map((button, index) => { | ||
| return ( | ||
| <Button | ||
| key={`${index}-${button.text}`} | ||
| onPress={button.onPress} | ||
| >{button.text}</Button> | ||
| ); | ||
| }); | ||
| const titleComponent = <Text | ||
| variant='titleMedium' | ||
| accessibilityRole='header' | ||
| style={styles.dialogLabel} | ||
| >{dialog.title}</Text>; | ||
|
|
||
| return ( | ||
| <Surface | ||
| testID={'prompt-dialog'} | ||
| style={styles.dialogContainer} | ||
| key={dialog.key} | ||
| elevation={1} | ||
| > | ||
| <Dialog.Content style={styles.dialogContent}> | ||
| {dialog.title ? titleComponent : null} | ||
| <Text | ||
| variant='bodyMedium' | ||
| style={styles.dialogLabel} | ||
| >{dialog.message}</Text> | ||
| </Dialog.Content> | ||
| {isMenu ? <Divider/> : null} | ||
| <Dialog.Actions | ||
| style={styles.dialogActions} | ||
| > | ||
| {buttons} | ||
| </Dialog.Actions> | ||
| </Surface> | ||
| ); | ||
| }; | ||
|
|
||
| export default PromptDialog; |
Oops, something went wrong.