From bbea0529354c392f70843860956421e9bc25f2c6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 27 Jul 2023 16:20:33 +0200
Subject: [PATCH] Fix emoji picker button scrolling with textarea content in
single-column view (#25304)
---
.../mastodon/features/compose/components/compose_form.jsx | 3 +--
app/javascript/styles/mastodon/components.scss | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 74894fdc3..9222b2dc8 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -280,13 +280,12 @@ class ComposeForm extends ImmutablePureComponent {
autoFocus={autoFocus}
lang={this.props.lang}
>
- <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
-
<div className='compose-form__modifiers'>
<UploadFormContainer />
<PollFormContainer />
</div>
</AutosuggestTextarea>
+ <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
<div className='compose-form__buttons-wrapper'>
<div className='compose-form__buttons'>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 24ba0c6e9..d16380de5 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2891,6 +2891,7 @@ $ui-header-height: 55px;
border-radius: 4px;
transition: box-shadow 300ms linear;
min-height: 0;
+ position: relative;
&.active {
transition: none;