fix: Emoji picker is not working on the expanded layout (#5398)

This commit is contained in:
Sivin Varghese 2022-09-06 10:41:39 +05:30 committed by GitHub
parent f5e360fd4d
commit 79406c5775
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 6 deletions

View file

@ -431,14 +431,14 @@ export default {
position: fixed; position: fixed;
left: unset; left: unset;
position: absolute; position: absolute;
}
.emoji-dialog::before { &::before {
transform: rotate(0deg); transform: rotate(0deg);
left: 5px; left: var(--space-half);
bottom: var(--space-minus-slab); bottom: var(--space-minus-slab);
} }
} }
}
} }
.sidebar-toggle__wrap { .sidebar-toggle__wrap {
display: flex; display: flex;

View file

@ -26,6 +26,7 @@
<emoji-input <emoji-input
v-if="showEmojiPicker" v-if="showEmojiPicker"
v-on-clickaway="hideEmojiPicker" v-on-clickaway="hideEmojiPicker"
:class="emojiDialogClassOnExpanedLayout"
:on-click="emojiOnClick" :on-click="emojiOnClick"
/> />
<reply-email-head <reply-email-head
@ -161,6 +162,7 @@ import inboxMixin from 'shared/mixins/inboxMixin';
import uiSettingsMixin from 'dashboard/mixins/uiSettings'; import uiSettingsMixin from 'dashboard/mixins/uiSettings';
import { DirectUpload } from 'activestorage'; import { DirectUpload } from 'activestorage';
import { frontendURL } from '../../../helper/URLHelper'; import { frontendURL } from '../../../helper/URLHelper';
import wootConstants from 'dashboard/constants';
export default { export default {
components: { components: {
@ -388,6 +390,20 @@ export default {
const selectedTweet = this.selectedTweet || {}; const selectedTweet = this.selectedTweet || {};
return selectedTweet.id; return selectedTweet.id;
}, },
isOnExpandedLayout() {
const {
LAYOUT_TYPES: { CONDENSED },
} = wootConstants;
const {
conversation_display_type: conversationDisplayType = CONDENSED,
} = this.uiSettings;
return conversationDisplayType !== CONDENSED;
},
emojiDialogClassOnExpanedLayout() {
return this.isOnExpandedLayout && !this.popoutReplyBox
? 'emoji-dialog--expanded'
: '';
},
replyToUserLength() { replyToUserLength() {
const selectedTweet = this.selectedTweet || {}; const selectedTweet = this.selectedTweet || {};
const { const {
@ -867,7 +883,18 @@ export default {
filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.08)); filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.08));
} }
} }
.emoji-dialog--expanded {
left: unset;
bottom: var(--space-jumbo);
position: absolute;
z-index: var(--z-index-normal);
&::before {
transform: rotate(0deg);
left: var(--space-half);
bottom: var(--space-minus-slab);
}
}
.message-signature { .message-signature {
margin-bottom: 0; margin-bottom: 0;

View file

@ -189,7 +189,11 @@ export default {
} }
.emoji-dialog { .emoji-dialog {
right: space-smaller;
&::before {
right: $space-one; right: $space-one;
}
} }
.button-wrap { .button-wrap {