Mobile: Accessibility: Add checked/unchecked accessibility information to the "sort notes by" dialog #11411
+135
−39
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| import * as React from 'react'; | ||
| import { useMemo } from 'react'; | ||
| import { StyleSheet, TextStyle, View } from 'react-native'; | ||
| import { TouchableRipple, Text } from 'react-native-paper'; | ||
| import { PromptButtonSpec } from './types'; | ||
| import { ThemeStyle, themeStyle } from '../global-style'; | ||
| import Icon from '../Icon'; | ||
|
|
||
| interface Props { | ||
| themeId: number; | ||
| buttonSpec: PromptButtonSpec; | ||
| } | ||
|
|
||
| const useStyles = (theme: ThemeStyle) => { | ||
| return useMemo(() => { | ||
| const buttonText: TextStyle = { | ||
| color: theme.color4, | ||
| textAlign: 'center', | ||
| }; | ||
|
|
||
| return StyleSheet.create({ | ||
| buttonContainer: { | ||
| // This applies the borderRadius to the TouchableRipple's parent, which | ||
| // seems necessary on Android. | ||
| borderRadius: theme.borderRadius, | ||
| overflow: 'hidden', | ||
| }, | ||
| button: { | ||
| borderRadius: theme.borderRadius, | ||
| padding: 10, | ||
| }, | ||
| buttonContent: { | ||
| display: 'flex', | ||
| flexDirection: 'row', | ||
| justifyContent: 'center', | ||
| alignItems: 'baseline', | ||
| }, | ||
| buttonText, | ||
| icon: { | ||
| ...buttonText, | ||
| marginRight: 8, | ||
| }, | ||
| }); | ||
| }, [theme]); | ||
| }; | ||
|
|
||
| const PromptButton: React.FC<Props> = props => { | ||
| const theme = themeStyle(props.themeId); | ||
| const styles = useStyles(theme); | ||
|
|
||
| const { checked, text, iconChecked, onPress } = props.buttonSpec; | ||
|
|
||
| const isCheckbox = (checked ?? null) !== null; | ||
| const icon = checked ? ( | ||
| <> | ||
| <Icon | ||
| accessibilityLabel={null} | ||
| style={styles.icon} | ||
| name={iconChecked ?? 'fas fa-check'} | ||
| /> | ||
| </> | ||
| ) : null; | ||
|
|
||
| return ( | ||
| <View style={styles.buttonContainer}> | ||
| <TouchableRipple | ||
| onPress={onPress} | ||
| style={styles.button} | ||
| rippleColor={theme.backgroundColorHover4} | ||
| accessibilityRole={isCheckbox ? 'checkbox' : 'button'} | ||
| accessibilityState={isCheckbox ? { checked } : null} | ||
| aria-checked={isCheckbox ? checked : undefined} | ||
| > | ||
| <View style={styles.buttonContent}> | ||
| {icon} | ||
| <Text style={styles.buttonText}>{text}</Text> | ||
| </View> | ||
| </TouchableRipple> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| export default PromptButton; | ||
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 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 |
|---|---|---|
|
|
@@ -3,6 +3,8 @@ import { Platform, TextStyle, ViewStyle } from 'react-native'; | |
| import { themeById } from '@joplin/lib/theme'; | ||
| import { Theme as BaseTheme } from '@joplin/lib/themes/type'; | ||
|
|
||
| const Color = require('color'); | ||
|
|
||
| const baseStyle = { | ||
| appearance: 'light', | ||
| fontSize: 16, | ||
|
|
@@ -16,12 +18,15 @@ const baseStyle = { | |
| }; | ||
|
|
||
| export type ThemeStyle = BaseTheme & typeof baseStyle & { | ||
| backgroundColorHover4: string; | ||
|
|
||
| fontSize: number; | ||
| fontSizeSmaller: number; | ||
| marginRight: number; | ||
| marginLeft: number; | ||
| marginTop: number; | ||
| marginBottom: number; | ||
| borderRadius: number; | ||
| icon: TextStyle; | ||
| lineInput: ViewStyle; | ||
| buttonRow: ViewStyle; | ||
|
|
@@ -112,6 +117,9 @@ function extraStyles(theme: BaseTheme) { | |
| keyboardAppearance: theme.appearance, | ||
| color5: theme.color5 ?? theme.backgroundColor4, | ||
| backgroundColor5: theme.backgroundColor5 ?? theme.color4, | ||
|
|
||
| backgroundColorHover4: Color(theme.color4).alpha(0.12).rgb().string(), | ||
|
There was a problem hiding this comment.
Line 111 in d7b3ef8 Additionally, |
||
| borderRadius: 24, | ||
| }; | ||
| } | ||
|
|
||
|
|
||
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 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This pull request switches from a React Native Paper
Buttonto aTouchableRipple. Unlike<Button>,TouchableRippleallows providing a customaccessibilityState. This allows communicating whether the button represents a checked/unchecked menu item.On web,
aria-checkedseems necessary —react-native-webseems to ignore theaccessibilityState'scheckedoption.