-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
17051 - migrated Checkbox to PressableWithFeedback #20257
Merged
Merged
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
ac6b7d7
migrated Checkbox to PressableWithFeedback
Skalakid 73859b7
Merge branch 'main' into 17051-migrate-Checkbox
Skalakid 0690682
Review changes
Skalakid d16f038
Merge branch 'main' into 17051-migrate-Checkbox
Skalakid 46c4130
removed hoverDimmingValue as it is set to 1 by default
Skalakid d25865e
Merge branch 'main' into 17051-migrate-Checkbox
Skalakid 5d1e5ed
Merge branch 'main' into 17051-migrate-Checkbox
Skalakid 4917bf7
fixed bug with password text input eye icon
Skalakid 56b01f4
updated comment
Skalakid a63eee4
review changes + added accessibility labels
Skalakid 0426c25
Merge branch 'main' into 17051-migrate-Checkbox
Skalakid File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,12 @@ | ||
import React from 'react'; | ||
import {View, Pressable} from 'react-native'; | ||
import {View} from 'react-native'; | ||
import PropTypes from 'prop-types'; | ||
import styles from '../styles/styles'; | ||
import themeColors from '../styles/themes/default'; | ||
import stylePropTypes from '../styles/stylePropTypes'; | ||
import Icon from './Icon'; | ||
import * as Expensicons from './Icon/Expensicons'; | ||
import PressableWithFeedback from './Pressable/PressableWithFeedback'; | ||
|
||
const propTypes = { | ||
/** Whether checkbox is checked */ | ||
|
@@ -34,6 +35,9 @@ const propTypes = { | |
|
||
/** A ref to forward to the Pressable */ | ||
forwardedRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.instanceOf(React.Component)})]), | ||
|
||
/** A ref to forward to the Pressable */ | ||
accessibilityLabel: PropTypes.string, | ||
}; | ||
|
||
const defaultProps = { | ||
|
@@ -45,6 +49,7 @@ const defaultProps = { | |
forwardedRef: undefined, | ||
children: null, | ||
onMouseDown: undefined, | ||
accessibilityLabel: '', | ||
roryabraham marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; | ||
|
||
function Checkbox(props) { | ||
|
@@ -67,7 +72,7 @@ function Checkbox(props) { | |
}; | ||
|
||
return ( | ||
<Pressable | ||
<PressableWithFeedback | ||
disabled={props.disabled} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👋 Just a heads-up that this has caused a small regression in #22413 onKeyDown={!isDisabled ? onKeyDown : undefined} |
||
onPress={firePressHandlerOnClick} | ||
onMouseDown={props.onMouseDown} | ||
|
@@ -76,6 +81,8 @@ function Checkbox(props) { | |
onKeyDown={handleSpaceKey} | ||
accessibilityRole="checkbox" | ||
accessibilityState={{checked: props.isChecked}} | ||
accessibilityLabel={props.accessibilityLabel} | ||
pressDimmingValue={1} | ||
> | ||
{props.children ? ( | ||
props.children | ||
|
@@ -100,7 +107,7 @@ function Checkbox(props) { | |
)} | ||
</View> | ||
)} | ||
</Pressable> | ||
</PressableWithFeedback> | ||
); | ||
} | ||
|
||
|
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
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.
@Skalakid Wrong type comment here. Could you update this?