fix: Emoji picker is not working on the expanded layout (#5398)
This commit is contained in:
parent
f5e360fd4d
commit
79406c5775
3 changed files with 37 additions and 6 deletions
|
@ -431,15 +431,15 @@ 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;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -189,8 +189,12 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoji-dialog {
|
.emoji-dialog {
|
||||||
|
right: space-smaller;
|
||||||
|
|
||||||
|
&::before {
|
||||||
right: $space-one;
|
right: $space-one;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.button-wrap {
|
.button-wrap {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
Loading…
Reference in a new issue