self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-13 00:10:37 +02:00
Code Issues Releases Activity

iOS: Accessibility: Fix focus gets stuck on "Attach" in the note actions menu (#11958)

Browse Source
This commit is contained in:
Henry Heino
2025-03-15 06:20:23 -07:00
committed by GitHub
parent c8b01d11d6
commit cbfe109c41
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/app-mobile/components/ScreenHeader/Menu.tsx
View File

@ -1,6 +1,6 @@
import * as React from 'react'; import * as React from 'react';
import { useCallback, useMemo, useState } from 'react'; import { useCallback, useMemo, useState } from 'react';
import { StyleSheet, TextStyle, View, Text, ScrollView, useWindowDimensions } from 'react-native'; import { StyleSheet, TextStyle, View, Text, ScrollView, useWindowDimensions, Platform } from 'react-native';
import { themeStyle } from '../global-style'; import { themeStyle } from '../global-style';
import { Menu, MenuOption as MenuOptionComponent, MenuOptions, MenuTrigger } from 'react-native-popup-menu'; import { Menu, MenuOption as MenuOptionComponent, MenuOptions, MenuTrigger } from 'react-native-popup-menu';
import AccessibleView from '../accessibility/AccessibleView'; import AccessibleView from '../accessibility/AccessibleView';
@ -91,7 +91,10 @@ const MenuComponent: React.FC<Props> = props => {
<View key={`menuOption_divider_${keyCounter++}`} style={styles.divider} />, <View key={`menuOption_divider_${keyCounter++}`} style={styles.divider} />,
); );
} else { } else {
const canAutoFocus = isFirst; // Don't auto-focus on iOS -- as of RN 0.74, this causes focus to get stuck. However,
// the auto-focus seems to be necessary on web (and possibly Android) to avoid first focusing
// the dismiss button and other items not in the menu:
const canAutoFocus = isFirst && Platform.OS !== 'ios';
const key = `menuOption_${option.key ?? keyCounter++}`; const key = `menuOption_${option.key ?? keyCounter++}`;
menuOptionComponents.push( menuOptionComponents.push(
<MenuOptionComponent value={option.onPress} key={key} style={styles.contextMenuItem} disabled={!!option.disabled}> <MenuOptionComponent value={option.onPress} key={key} style={styles.contextMenuItem} disabled={!!option.disabled}>