aboutsummaryrefslogtreecommitdiff
path: root/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-05-03 10:42:18 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-05-03 10:42:18 +0200
commitad5d3134e406c2bcfceca6a1b7dd3dceb6ec1061 (patch)
treed0325931501eff63979958702a5b78c2b146751f /app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
parenta5293fdf619b0be32a420c36a73e7ecfbe6d27cd (diff)
downloadmastodon-ad5d3134e406c2bcfceca6a1b7dd3dceb6ec1061.tar
mastodon-ad5d3134e406c2bcfceca6a1b7dd3dceb6ec1061.tar.gz
mastodon-ad5d3134e406c2bcfceca6a1b7dd3dceb6ec1061.tar.bz2
mastodon-ad5d3134e406c2bcfceca6a1b7dd3dceb6ec1061.zip
Place emoji picker top if it is closer to the bottom of the viewport (fixes #7277) (#7314)
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js')
-rw-r--r--app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js13
1 files changed, 8 insertions, 5 deletions
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index dc8fc02ba..84665a7e8 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -162,12 +162,12 @@ class EmojiPickerMenu extends React.PureComponent {
static defaultProps = {
style: {},
loading: true,
- placement: 'bottom',
frequentlyUsedEmojis: [],
};
state = {
modifierOpen: false,
+ placement: null,
};
handleDocumentClick = e => {
@@ -298,7 +298,7 @@ export default class EmojiPickerDropdown extends React.PureComponent {
this.dropdown = c;
}
- onShowDropdown = () => {
+ onShowDropdown = ({ target }) => {
this.setState({ active: true });
if (!EmojiPicker) {
@@ -313,6 +313,9 @@ export default class EmojiPickerDropdown extends React.PureComponent {
this.setState({ loading: false });
});
}
+
+ const { top } = target.getBoundingClientRect();
+ this.setState({ placement: top * 2 < innerHeight ? 'bottom' : 'top' });
}
onHideDropdown = () => {
@@ -324,7 +327,7 @@ export default class EmojiPickerDropdown extends React.PureComponent {
if (this.state.active) {
this.onHideDropdown();
} else {
- this.onShowDropdown();
+ this.onShowDropdown(e);
}
}
}
@@ -346,7 +349,7 @@ export default class EmojiPickerDropdown extends React.PureComponent {
render () {
const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
const title = intl.formatMessage(messages.emoji);
- const { active, loading } = this.state;
+ const { active, loading, placement } = this.state;
return (
<div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown}>
@@ -358,7 +361,7 @@ export default class EmojiPickerDropdown extends React.PureComponent {
/>
</div>
- <Overlay show={active} placement='bottom' target={this.findTarget}>
+ <Overlay show={active} placement={placement} target={this.findTarget}>
<EmojiPickerMenu
custom_emojis={this.props.custom_emojis}
loading={loading}