Skip to content

Fix TextInput focus when inside a FocusZone#3849

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
Navneet Kambo (nakambo) merged 4 commits into from
Jan 29, 2025
Merged

Fix TextInput focus when inside a FocusZone #3849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e35a148
Fix TextInput focus when inside a FocusZone
nakambo Jan 29, 2025
a4fe3e3
remove unnecessary testing code
nakambo Jan 29, 2025
ecaf4b0
Change files
nakambo Jan 29, 2025
2941b2f
prettier
nakambo Jan 29, 2025
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
19 changes: 18 additions & 1 deletion apps/fluent-tester/src/TestComponents/FocusZone/FocusZoneTest.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { View, ScrollView, Pressable } from 'react-native';
import { View, ScrollView, Pressable, TextInput } from 'react-native';

import type { FocusZoneDirection, FocusZoneTabNavigation } from '@fluentui/react-native';
import { FocusZone, MenuButton, Text, useOnPressWithFocus } from '@fluentui/react-native';
Expand DownExpand Up@@ -207,6 +207,19 @@ const FocusZoneGrid: React.FunctionComponent = () => {
);
};

const FocusZoneTextInput: React.FunctionComponent = () => {
return (
<FocusZoneListWrapper>
<>
<Text>FocusZone Grid</Text>
<FocusZone>
<TextInput multiline={true} />
</FocusZone>
</>
</FocusZoneListWrapper>
);
};

const focusZoneSections: TestSection[] = [
{
name: 'Common FocusZone Usage',
Expand DownExpand Up@@ -245,6 +258,10 @@ const focusZoneSections: TestSection[] = [
name: 'FocusZone Grid',
component: FocusZoneGrid,
},
{
name: 'FocusZone with TextInput',
component: FocusZoneTextInput,
},
];

const e2eSections: TestSection[] = [
Expand Down
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-focus-zone-d859c102-4cb7-4d68-8107-d1bbfeb76759.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Fix TextInput focus when inside a FocusZone",
"packageName": "@fluentui-react-native/focus-zone",
"email": "nakambo@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-native-tester-3f2249ed-41c7-43f3-8b5e-5955e1e06001.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Add TextInput inside FocusZone case",
"packageName": "@fluentui-react-native/tester",
"email": "nakambo@microsoft.com",
"dependentChangeType": "patch"
}
10 changes: 9 additions & 1 deletion packages/components/FocusZone/macos/RCTFocusZone.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
#import "KeyCodes.h"
#import <React/RCTBaseTextInputView.h>
#import "RCTFocusZone.h"
#import "RCTi18nUtil.h"

Expand DownExpand Up@@ -61,7 +62,14 @@ static inline CGFloat GetMinDistanceBetweenRectVerticesAndPoint(NSRect rect, NSP

for (NSView *view in [parentView subviews]) {
if ([view acceptsFirstResponder]) {
return view;
if ([view isKindOfClass:[RCTBaseTextInputView class]]) {
RCTUIView *backedTextInputView = [(RCTBaseTextInputView *)view backedTextInputView];
if ([backedTextInputView acceptsFirstResponder]) {
return backedTextInputView;
}
} else {
return view;
}
}

NSView *match = GetFirstFocusableViewWithin(view);
Expand Down