Desktop: input emoji added
This commit is contained in:
parent
a365b5cc26
commit
0acf6538d7
2 changed files with 46 additions and 6 deletions
|
|
@ -211,6 +211,16 @@ $admin-fg: white;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
min-width: 48px;
|
min-width: 48px;
|
||||||
|
|
||||||
|
&.input-more-icon {
|
||||||
|
svg {
|
||||||
|
fill: black;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media #{map-get($display-breakpoints, 'sm-and-down')} {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.input-area-text {
|
.input-area-text {
|
||||||
max-height: 30vh;
|
max-height: 30vh;
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,10 @@
|
||||||
v-on:edit="edit(selectedEvent)"
|
v-on:edit="edit(selectedEvent)"
|
||||||
v-on:redact="redact(selectedEvent)"
|
v-on:redact="redact(selectedEvent)"
|
||||||
v-on:download="download(selectedEvent)"
|
v-on:download="download(selectedEvent)"
|
||||||
v-on:more="showMoreMessageOperations"
|
v-on:more="
|
||||||
|
isEmojiQuickReaction= true
|
||||||
|
showMoreMessageOperations($event)
|
||||||
|
"
|
||||||
:event="selectedEvent"
|
:event="selectedEvent"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -233,6 +236,23 @@
|
||||||
</v-btn>
|
</v-btn>
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
||||||
|
<v-col
|
||||||
|
class="input-area-button text-center flex-grow-0 flex-shrink-1 input-more-icon"
|
||||||
|
>
|
||||||
|
<v-btn
|
||||||
|
fab
|
||||||
|
small
|
||||||
|
elevation="0"
|
||||||
|
v-blur
|
||||||
|
@click.stop="
|
||||||
|
isEmojiQuickReaction = false
|
||||||
|
showMoreMessageOperations($event)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<v-icon>$vuetify.icons.addReaction</v-icon>
|
||||||
|
</v-btn>
|
||||||
|
</v-col>
|
||||||
|
|
||||||
<v-col v-if="$config.shortCodeStickers" class="input-area-button text-center flex-grow-0 flex-shrink-1">
|
<v-col v-if="$config.shortCodeStickers" class="input-area-button text-center flex-grow-0 flex-shrink-1">
|
||||||
<v-btn
|
<v-btn
|
||||||
v-if="!showRecorder"
|
v-if="!showRecorder"
|
||||||
|
|
@ -495,6 +515,8 @@ export default {
|
||||||
|
|
||||||
/** Calculated style for message operations. We position the "popup" at the selected message. */
|
/** Calculated style for message operations. We position the "popup" at the selected message. */
|
||||||
opStyle: "",
|
opStyle: "",
|
||||||
|
|
||||||
|
isEmojiQuickReaction: true
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -1254,13 +1276,21 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
emojiSelected(e) {
|
emojiSelected(e) {
|
||||||
|
if(this.isEmojiQuickReaction) {
|
||||||
|
// When quick emoji picker is clicked
|
||||||
|
if (this.selectedEvent) {
|
||||||
|
const event = this.selectedEvent;
|
||||||
|
this.selectedEvent = null;
|
||||||
|
this.sendQuickReaction({ reaction: e.data, event: event });
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// When text input emoji picker is clicked
|
||||||
|
this.currentInput = e.data;
|
||||||
|
this.$refs.messageInput.focus();
|
||||||
|
}
|
||||||
|
|
||||||
this.showEmojiPicker = false;
|
this.showEmojiPicker = false;
|
||||||
this.$refs.messageOperationsSheet.close();
|
this.$refs.messageOperationsSheet.close();
|
||||||
if (this.selectedEvent) {
|
|
||||||
const event = this.selectedEvent;
|
|
||||||
this.selectedEvent = null;
|
|
||||||
this.sendQuickReaction({ reaction: e.data, event: event });
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
sendQuickReaction(e) {
|
sendQuickReaction(e) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue