Skip to content

Suppress block inserter focus loop #33049

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
guarani merged 5 commits into from
Jul 5, 2021
Merged

Suppress block inserter focus loop #33049

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c1a36b
Suppress block inserter focus loop
Jun 28, 2021
d9f85fa
Make focus loop bug workaround iOS-specific
Jun 29, 2021
f588909
Merge branch 'trunk' into rnmobile/fix/focus-loop
Jun 29, 2021
3634f47
Merge branch 'trunk' into rnmobile/fix/focus-loop
Jun 30, 2021
19c158f
Update focus loop workaround for VoiceOver
Jul 1, 2021
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
21 changes: 19 additions & 2 deletions packages/block-editor/src/components/inserter/menu.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
/**
* External dependencies
*/
import { LayoutAnimation, TouchableHighlight } from 'react-native';
import {
AccessibilityInfo,
LayoutAnimation,
TouchableHighlight,
Platform,
} from 'react-native';

/**
* WordPress dependencies
Expand Down Expand Up @@ -140,7 +145,19 @@ function InserterMenu( {

const onSelectItem = useCallback(
( item ) => {
onInsert( item );
// Avoid a focus loop, see https://github.com/WordPress/gutenberg/issues/30562
if ( Platform.OS === 'ios' ) {
AccessibilityInfo.isScreenReaderEnabled().then( ( enabled ) => {
// In testing, the bug focus loop needed a longer timeout when VoiceOver was enabled
const timeout = enabled ? 200 : 100;
// eslint-disable-next-line @wordpress/react-no-unsafe-timeout
setTimeout( () => {
onInsert( item );
}, timeout );
} );
} else {
onInsert( item );
}
onSelect( item );
},
[ onInsert, onSelect ]
Expand Down