Skip to content

[0.70] Remove unnecessary overrides to onFocus and onBlur in Pressable #11014

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 15, 2022
Merged

[0.70] Remove unnecessary overrides to onFocus and onBlur in Pressable #11014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/@office-iss-react-native-win32-d749cec8-efe8-47ab-86f3-2a7777738436.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Remove unnecessary overrides to onFocus and onBlur in Pressable",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/react-native-windows-d03682bc-a25c-4760-a5f6-c2f540cb8725.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Remove unnecessary overrides to onFocus and onBlur in Pressable",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
20 changes: 0 additions & 20 deletions ...ages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,22 +253,6 @@ function Pressable(props: Props, forwardedRef): React.Node {
const viewRef = useRef<React.ElementRef<typeof View> | null>(null);
useImperativeHandle(forwardedRef, () => viewRef.current);

// [Windows
const _onBlur = (event: BlurEvent) => {
TextInputState.blurInput(viewRef.current);
if (props.onBlur) {
props.onBlur(event);
}
};

const _onFocus = (event: FocusEvent) => {
TextInputState.focusInput(viewRef.current);
if (props.onFocus) {
props.onFocus(event);
}
};
// Windows]

const android_rippleConfig = useAndroidRippleForView(android_ripple, viewRef);

const [pressed, setPressed] = usePressState(testOnly_pressed === true);
Expand Down Expand Up @@ -360,10 +344,6 @@ function Pressable(props: Props, forwardedRef): React.Node {
<View
{...restPropsWithDefaults}
{...eventHandlers}
// [Windows
onBlur={_onBlur}
onFocus={_onFocus}
// Windows]
ref={viewRef}
style={typeof style === 'function' ? style({pressed}) : style}>
{typeof children === 'function' ? children({pressed}) : children}
Expand Down
2 changes: 2 additions & 0 deletions packages/@react-native-windows/tester/src/js/examples/Pressable/PressableExample.windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ function PressableFeedbackEvents() {
accessibilityLabel="pressable feedback events"
accessibilityRole="button"
// [Windows
onFocus={() => appendEvent('focus')}
onBlur={() => appendEvent('blur')}
onHoverIn={() => appendEvent('hover in')}
onHoverOut={() => appendEvent('hover out')}
// Windows]
Expand Down
20 changes: 0 additions & 20 deletions vnext/src/Libraries/Components/Pressable/Pressable.windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,22 +253,6 @@ function Pressable(props: Props, forwardedRef): React.Node {
const viewRef = useRef<React.ElementRef<typeof View> | null>(null);
useImperativeHandle(forwardedRef, () => viewRef.current);

// [Windows
const _onBlur = (event: BlurEvent) => {
TextInputState.blurInput(viewRef.current);
if (props.onBlur) {
props.onBlur(event);
}
};

const _onFocus = (event: FocusEvent) => {
TextInputState.focusInput(viewRef.current);
if (props.onFocus) {
props.onFocus(event);
}
};
// Windows]

const android_rippleConfig = useAndroidRippleForView(android_ripple, viewRef);

const [pressed, setPressed] = usePressState(testOnly_pressed === true);
Expand Down Expand Up @@ -360,10 +344,6 @@ function Pressable(props: Props, forwardedRef): React.Node {
<View
{...restPropsWithDefaults}
{...eventHandlers}
// [Windows
onBlur={_onBlur}
onFocus={_onFocus}
// Windows]
ref={viewRef}
style={typeof style === 'function' ? style({pressed}) : style}>
{typeof children === 'function' ? children({pressed}) : children}
Expand Down