Skip to content

fix: prevent elastic scrolling when emoji picker is opened #24324

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
amyevans merged 4 commits into from
Aug 11, 2023
Merged

fix: prevent elastic scrolling when emoji picker is opened #24324

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22eb27f
fix: prevent elastic scrolling when emoji picker is opened
sangar-1028 Aug 9, 2023
d68ea93
fix: prettier
sangar-1028 Aug 9, 2023
3b27a59
fix: apply overflow only to Y axis
sangar-1028 Aug 11, 2023
4048872
fix: comments
sangar-1028 Aug 11, 2023
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
11 changes: 10 additions & 1 deletion src/components/EmojiPicker/EmojiPickerMenu/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,9 @@ class EmojiPickerMenu extends Component {

render() {
const isFiltered = this.emojis.length !== this.state.filteredEmojis.length;
const listStyle = StyleUtils.getEmojiPickerListHeight(isFiltered, this.props.windowHeight);
const height = !listStyle.maxHeight || listStyle.height < listStyle.maxHeight ? listStyle.height : listStyle.maxHeight;
const overflowLimit = Math.floor(height / CONST.EMOJI_PICKER_ITEM_HEIGHT) * 8;
return (
<View
style={[styles.emojiPickerContainer, StyleUtils.getEmojiPickerStyle(this.props.isSmallScreenWidth)]}
Expand Down Expand Up @@ -557,7 +560,13 @@ class EmojiPickerMenu extends Component {
renderItem={this.renderItem}
keyExtractor={this.keyExtractor}
numColumns={CONST.EMOJI_NUM_PER_ROW}
style={StyleUtils.getEmojiPickerListHeight(isFiltered, this.props.windowHeight)}
style={[
listStyle,
// This prevents elastic scrolling when scroll reaches the start or end
{overscrollBehaviorY: 'contain'},
// Set overflow to hidden to prevent elastic scrolling when there are not enough contents to scroll in FlatList
{overflowY: this.state.filteredEmojis.length > overflowLimit ? 'auto' : 'hidden'},
]}
extraData={[this.state.filteredEmojis, this.state.highlightedIndex, this.props.preferredSkinTone]}
stickyHeaderIndices={this.state.headerIndices}
onScroll={(e) => (this.currentScrollOffset = e.nativeEvent.contentOffset.y)}
Expand Down