Skip to content
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

[FIX] Add view with accessibility label on top of floating toolbar #20267

Merged
merged 1 commit into from
Feb 18, 2020
Merged
Changes from all commits
Commits
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
46 changes: 23 additions & 23 deletions packages/block-editor/src/components/block-list/block.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,27 +198,27 @@ class BlockListBlock extends Component {
);

return (
<>
{ isSelected && (
<FloatingToolbar>
<Toolbar passedStyle={ styles.toolbar }>
<ToolbarButton
title={ __( 'Navigate Up' ) }
onClick={ () =>
this.props.onSelect( parentId )
}
icon={ NavigateUpSVG }
/>
<View style={ styles.pipe } />
</Toolbar>
<Breadcrumbs clientId={ clientId } />
</FloatingToolbar>
) }
<TouchableWithoutFeedback
onPress={ this.onFocus }
accessible={ ! isSelected }
accessibilityRole={ 'button' }
>
<TouchableWithoutFeedback
onPress={ this.onFocus }
accessible={ ! isSelected }
accessibilityRole={ 'button' }
>
<View accessibilityLabel={ accessibilityLabel }>
{ isSelected && (
<FloatingToolbar>
<Toolbar passedStyle={ styles.toolbar }>
<ToolbarButton
title={ __( 'Navigate Up' ) }
onClick={ () =>
this.props.onSelect( parentId )
}
icon={ NavigateUpSVG }
/>
<View style={ styles.pipe } />
</Toolbar>
<Breadcrumbs clientId={ clientId } />
</FloatingToolbar>
) }
<View
pointerEvents={ isTouchable ? 'auto' : 'box-only' }
accessibilityLabel={ accessibilityLabel }
Expand All @@ -238,8 +238,8 @@ class BlockListBlock extends Component {
) }
</View>
</View>
</TouchableWithoutFeedback>
</>
</View>
</TouchableWithoutFeedback>
);
}
}
Expand Down